Syncing up for the 0.16.100 internal release.

svn path=/trunk/; revision=14551

32 files changed, 69590 insertions, 58610 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index b78cd9b87c..217315b486 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-31  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-10-31  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
 2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
 
 	* POTFILES.in: Add `calendar/cal-util/cal-component.c' and
diff --git a/po/az.po b/po/az.po
index e894ef6fb7..f2483adac3 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -14,6 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirən e'malatxana."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirir."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import VCard files into Evolution."
@@ -24,308 +34,313 @@ msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirən e'malatxana."
 msgid "Imports VCard files into Evolution."
 msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirir."
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Fərqli faylla"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Ad"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "ePoçt"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "İlk"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "İlk"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Köməkçi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Məşğul"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Şirkət"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Köçürt"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Şirkət"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Quruluş:\t"
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Maşın"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Məsləki Faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Məsləki Faks"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Ev faksı"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "2.nci Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Məşğul"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Başqa"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Başqa faks"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Peycer"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "2.nci ePoçt ünvanı"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Web Səhifəsi"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Bölmə"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "İdarə"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "İdarə"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Başlıq"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "İdarəci"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "May"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Ləqəb"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Ləqəb"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Yoldaş"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Təqvim"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Sərbəst/məşğul URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "_İl dönümü :"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Ad günü:  "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kateqoriyalar"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Tam Ad"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -333,7 +348,7 @@ msgstr ""
 "\n"
 "Ad: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -341,7 +356,7 @@ msgstr ""
 "\n"
 "  Prefiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -349,7 +364,7 @@ msgstr ""
 "\n"
 "  Verilən:\t"
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -357,7 +372,7 @@ msgstr ""
 "\n"
 "  Əlavə: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -365,7 +380,7 @@ msgstr ""
 "\n"
 "  Ailə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -373,7 +388,7 @@ msgstr ""
 "\n"
 "  Suffiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -381,7 +396,7 @@ msgstr ""
 "\n"
 "Ad günü:  "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -389,7 +404,7 @@ msgstr ""
 "\n"
 "Ünvan:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -397,7 +412,7 @@ msgstr ""
 "\n"
 "   Poçt Qutusu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -405,7 +420,7 @@ msgstr ""
 "\n"
 "   Əlavə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -413,7 +428,7 @@ msgstr ""
 "\n"
 "   Küçə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -421,7 +436,7 @@ msgstr ""
 "\n"
 "   Şəhər:\t"
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -429,7 +444,7 @@ msgstr ""
 "\n"
 "   Rayon:\t"
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -437,7 +452,7 @@ msgstr ""
 "\n"
 "   Poçt Kodu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -445,7 +460,7 @@ msgstr ""
 "\n"
 "   Ölkə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -453,7 +468,7 @@ msgstr ""
 "\n"
 "Təslim Etiketi:  "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -461,7 +476,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -469,7 +484,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -477,7 +492,7 @@ msgstr ""
 "\n"
 "ePoçt:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -485,7 +500,7 @@ msgstr ""
 "\n"
 "ePoçt:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -493,7 +508,7 @@ msgstr ""
 "\n"
 "Göndərici:  "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -501,7 +516,7 @@ msgstr ""
 "\n"
 "Zaman zolağı:  "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -509,7 +524,7 @@ msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -517,7 +532,7 @@ msgstr ""
 "\n"
 "Məslək:\t"
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -525,7 +540,7 @@ msgstr ""
 "\n"
 "Quruluş:\t"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -533,7 +548,7 @@ msgstr ""
 "\n"
 "   Ad:\t"
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -541,7 +556,7 @@ msgstr ""
 "\n"
 "   Bölmə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -549,7 +564,7 @@ msgstr ""
 "\n"
 "   Bölmə2:\t"
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -557,7 +572,7 @@ msgstr ""
 "\n"
 "   Bölmə3:\t"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -565,7 +580,7 @@ msgstr ""
 "\n"
 "   Bölmə4:\t"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -573,7 +588,7 @@ msgstr ""
 "\n"
 "Kateqoriyalar:\t"
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -591,7 +606,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -599,7 +614,7 @@ msgstr ""
 "\n"
 "Yeganə Kəlimə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -607,12 +622,12 @@ msgstr ""
 "\n"
 "Ümumi Açar:\t"
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Çoxlu İsmarıc"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "%s üçün parol girin"
@@ -621,39 +636,41 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Axtar"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Gözlənilir ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr ""
@@ -661,55 +678,55 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Təqvim yüklənir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Ox yüklənə bilmədi\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
@@ -753,49 +770,49 @@ msgstr "Ünvan Dəftərində ünvan göstərici e'malatxanası"
 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:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "_Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP Vericisi"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Yeni əlaqə"
@@ -831,7 +848,7 @@ msgid "Base"
 msgstr "Əsas"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "Əsas"
@@ -917,16 +934,16 @@ msgstr "Hesab İdarəsi"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Əlavə Et"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Düzəlt"
@@ -946,22 +963,28 @@ msgstr "Qapı:"
 msgid "_Server name:"
 msgstr "Verici İsmarıcı:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonoboyu başlada bilmədim"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -969,50 +992,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s üçün parol girin"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Ad daxil edən"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "ePoçt daxil edən"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kateqoriyalar"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kateqoriyalar:"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
@@ -1026,54 +1049,54 @@ msgstr "Qovluq Səyyahını göstərəcək olan URI"
 msgid "(none)"
 msgstr "( Adsızdır )"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "Fayl seç"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Yeni bir hesab yarat"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Ünvan dəftərini düzəlt"
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Əlaqə Mə'lumatını Düzəlt"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Əlaqələrə Əlavə Et"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "ePoçt Ünvanı: "
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Sorğuları Bağla"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
 
@@ -1085,52 +1108,61 @@ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü e'malatxanası"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Hamısını Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "E-poçt Göndərilir"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:532
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1196,12 +1228,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Əlaqə düzəldicisi"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Ətraflı"
 
@@ -1271,9 +1303,9 @@ msgstr "_Əlaqələr ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Sil"
@@ -1343,37 +1375,47 @@ msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 msgid "Delete Contact?"
 msgstr "Əlaqəni Silimmi?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "ePoçt"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Miss"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2514,7 +2556,7 @@ msgid "contact-list-editor"
 msgstr "Əlaqə düzəldicisi"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Əlaqə düzəldicisi"
@@ -2564,156 +2606,163 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Axtar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "Başlamayıb"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Təqvimi çap et"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d saniyə"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Aç"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Fərqli Çatdır"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə yeni bir ismarıc göndər"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 msgid "Success"
 msgstr "Qaynaqlar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Namə'lum xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "Fayl tapıla bilmədi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "G/Ç xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 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:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2723,7 +2772,7 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2731,75 +2780,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Köməkçi Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "İş Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Ev Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Əl Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "2.nci İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "2.nci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Digər Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "BaşqaÜnvanlar"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2987,98 +3045,113 @@ msgstr "En :"
 msgid "_Font..."
 msgstr "Yazı növü ..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Təqvimi çap et"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Təqvimi çap et"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Zərfi Çap Et"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 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/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Alçaq"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 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:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolutionun İcracı mündəricat parçası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "'Evolution'un Təqvim əlavəsi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Təqvim Mündəricatı parçası e'malatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "'Evolution'un məktub parçası e'malatxanası."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Təqvim iTip nümayiş idarəsi e'malatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Nümunəvi Təqvim idarəsi e'malaxanası"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Evolutionun təqvim parçasının mərkəzi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolutionun təqvim parçasının mərkəzi."
@@ -3091,49 +3164,29 @@ 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: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: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: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:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, 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: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ş"
+msgid "Starting:"
+msgstr "Qurğular..."
 
-#: 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:218
+msgid "Ending:"
+msgstr ""
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "_Sonlanma vaxtı:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 #, fuzzy
-msgid "Notification about your task"
-msgstr "\"Evolution\" haqqında mə'lumat göstər"
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: 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"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3155,12 +3208,12 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 #, fuzzy
 msgid "No description available."
 msgstr "Mündəricat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3168,7 +3221,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3179,39 +3232,39 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOME başladıla bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Bonoboyu başlada bilmədim"
+msgid "Could not create the alarm notify service"
+msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -3219,102 +3272,80 @@ msgstr "%A, %e %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "həftə"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Məşğul"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Tarix öz şəklində verilməlidir: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3324,56 +3355,59 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: 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"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Xeyr"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Axtar"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "Kart Nümayişi "
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "İ_ş  həftəsi"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "Görünüşləri Müəyyənləşdir"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "Ay"
@@ -3391,12 +3425,12 @@ msgstr "İzah :"
 msgid "Comment contains"
 msgstr "Şərh daxil edən"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Təqvim"
 
@@ -3404,9 +3438,9 @@ msgstr "Təqvim"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Vəzifə"
@@ -3416,26 +3450,26 @@ msgstr "Vəzifə"
 msgid "Folder containing to-do items"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Yeni bir iclas yarat"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
@@ -3512,52 +3546,52 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d gün"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr "1 gün"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr "2 həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "%d dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr "1 dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "%d saniyə"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr "1 saniyə"
@@ -3617,17 +3651,12 @@ msgstr "iclas qurtarandan sonra"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s verici %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3650,7 +3679,7 @@ msgstr "Xatırladıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -3681,7 +3710,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -3738,7 +3767,7 @@ msgid "First day of wee_k:"
 msgstr "Həftənin ilk günü:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Cümə"
 
@@ -3753,7 +3782,7 @@ msgid "Minutes"
 msgstr "dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -3763,7 +3792,7 @@ msgid "O_verdue tasks:"
 msgstr "Vaxtı Keçmiş İşlər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -3788,7 +3817,7 @@ msgid "Su_n"
 msgstr "Baz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -3808,7 +3837,7 @@ msgid "Tas_ks due today:"
 msgstr "Bügunki İşlər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -3834,12 +3863,12 @@ msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -3923,122 +3952,127 @@ msgstr "Çər"
 msgid "before the start of the appointment"
 msgstr "iclasın başlanğıcından əvvəl"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bu `%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bu `%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "Uyğun Tarix"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Fayllar düzgün güncəllənə bilmədi"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4046,53 +4080,53 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Fərqli Qeyd Et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, 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?"
@@ -4112,26 +4146,26 @@ msgstr "Silinən"
 msgid "Enter Delegate"
 msgstr "Silinən"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "Görüşü Ləğv Et"
@@ -4152,12 +4186,13 @@ msgid "Classification"
 msgstr "Sinifləndirmələr"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Gizli"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Tarix və Vaxt"
 
@@ -4167,12 +4202,12 @@ msgid "F_ree"
 msgstr "həftə"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Xü_susi"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Üm_umi"
 
@@ -4183,7 +4218,7 @@ msgid "Show Time As"
 msgstr "Göstər"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Mü_ndəricat:"
 
@@ -4195,36 +4230,19 @@ msgstr "_Sonlanma vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Maşın Telefonu"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "Lazımi İştirakçılar"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Ehtiyatdakı İştirakçılar"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Non-Participants"
-msgstr "Qeyri İştirakçılar"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Sil..."
@@ -4271,6 +4289,7 @@ msgid "Member"
 msgstr "Dekabr"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4289,7 +4308,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Növ"
@@ -4305,8 +4324,8 @@ msgid "_Change Organizer"
 msgstr "Təşkilatçı:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4318,23 +4337,23 @@ msgstr "Təşkilatçı:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu görüşdə \"Evolution\"un düzəldə bilməyəcəyi hallar var."
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "...da (də)"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "hadisələr"
 
@@ -4403,19 +4422,15 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4434,7 +4449,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4446,144 +4461,175 @@ msgstr "_Üstünlük:"
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "İzah :"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Başla_ma Tarixi:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Gizli"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Əlaqəni sil"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Bu vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün buraya tıqla"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Tarix öz şəklində verilməlidir: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -4614,8 +4660,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Mündəricat"
 
@@ -4628,345 +4674,427 @@ msgstr "Vəzifə"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün Hadisələri"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Tarixə Get..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Bu İclası sil"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Bu hadisənin daşına bilməsinə imkan ver"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Bu Hadisəni sil"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Bütün Hadisələri Sil"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "İstənən Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "İclas sonlanma saatı :"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "İstənən Mə'lumatlar"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Bitirmə Tarixi"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "təqvim haqqında"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Təqvim"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Namə'lum xəta"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Fayl seç"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "sonra idi"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Oldu"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr " Qəbul Et"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Girişimli"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr " Rədd Et"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "İstənən Mə'lumatlar"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "İzah :"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Mə'lumat"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Ləğv Edildi"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Görü İs_təyi (FIXME)"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, 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:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fayl seç"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "İsmarıcı Düzəlt"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Mə'lumat"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Vəzifə Taxtası"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "sonra idi"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Vəzifə So_rğusu (FIXME)"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, 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:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Cavab ver"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Təqvim İsmarıcı"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "İstənən Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "İstənən Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Sərbəst/məşğul URL"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, 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:844
+#: calendar/gui/e-itip-control.c:978
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/məşğul URL"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Əvvəlki İsmarıc"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 #, 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:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Ox yüklənə bilmədi\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Ziyarətçilərin ünvanları"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 #, 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:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% _Qurtardı:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Göndərilmə tarixi"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5007,86 +5135,106 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Maşın Telefonu"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "Lazımi İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Ehtiyatdakı İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:97
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Qeyri İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Qrup adı :"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Kağız qaynağı :"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Stul"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Qeyri İştirakçılar"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Gediş əlavə et"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr " Qəbul Et"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr " Rədd Et"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinən"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "İşləyir"
@@ -5094,114 +5242,120 @@ 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:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "Başqalarını _Dəvət Et ..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "Boş/Məşğulları _Təzələ"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "%s qaynağı açılır"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Yeni İclas ..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Təqvimi aç"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -5259,238 +5413,286 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3.ncü"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4.ncü"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6.ncı"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13.ncü"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14.ncü"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16.ncı"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23.ncü"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24.ncü"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26.ncı"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hazırkı gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hazırkı həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Hazırkı ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Hazırkı il ( %Y )"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Vəzifə"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Hal:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Üstünlük:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Faiz Qurtardı"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kateqoriyalar:\t"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Əlaqə"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "Bu üzvü çap et"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
+"yoxlayın."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 "\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşıdı."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5502,7 +5704,7 @@ msgstr ""
 "Bəzi vəzifələr daşına bilmədi. Ona görə də bu əməliyyat gələcəkdə də "
 "aparılmalıdır."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5511,7 +5713,7 @@ msgstr ""
 "`%s' tapıla bilmədi; təqvim qovluğuna heç bir vəzifə vəzifələr qovluğuna "
 "daşına bilməyəcək."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5520,113 +5722,113 @@ msgstr ""
 "`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim qovluğuna heç bir "
 "vəzifə vəzifələr qovluğuna daşına bilməyəcək."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "BBeÇaÇCaCŞ"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5650,7 +5852,7 @@ msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5658,7 +5860,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5666,94 +5868,94 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarıcı alınır"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarıc %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "İsmarıc açıla bilmir"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, 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:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, 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:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, 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:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "İsmarıclar köçürülür"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5762,7 +5964,7 @@ msgstr ""
 "Axtarış ifadəsi darana bilmir:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5771,7 +5973,7 @@ msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(hamısını yoxla) tək düzgün nəticə istəyir"
 
@@ -5780,195 +5982,195 @@ 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:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Çəngəllənə bilmədi: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s üçün qıfıl faylını yarada bilmədim: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Yenidən sına."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s məktub faylı yoxlana bilmir: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s məktub faylı açıla bilmir: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Müvəqqəti məktub faylı %s açıla bilmir: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Çəngəllənə bilmədi: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Məktub daşıma proqramı iflas etdi: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Namə'lum xəta)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Məktub faylı oxunma xətası: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 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:191
+#: camel/camel-pgp-context.c:194
 #, 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:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Lütfən %s parol kəlimənizi girin"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, 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:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, 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:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:699
+#: camel/camel-pgp-context.c:741
 #, 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:891
+#: camel/camel-pgp-context.c:939
 #, 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:897
+#: camel/camel-pgp-context.c:945
 #, 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:908
+#: camel/camel-pgp-context.c:956
 #, 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:1076
+#: camel/camel-pgp-context.c:1129
 #, 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:1086
+#: camel/camel-pgp-context.c:1139
 #, 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:1093
+#: camel/camel-pgp-context.c:1146
 #, 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:1102
+#: camel/camel-pgp-context.c:1155
 #, 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:1264
+#: camel/camel-pgp-context.c:1323
 #, 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:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, 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"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s yüklənə bilmir: Modul yükləmə bu sistemdə dəstəklənmir."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklənə bilmədi: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmir: Modulda başlatma kodu yoxdur."
@@ -5988,7 +6190,7 @@ msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
@@ -5998,12 +6200,12 @@ msgid "(unknown host)"
 msgstr "(namə'lum ev sahibi)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi"
@@ -6115,7 +6317,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -6132,8 +6334,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Parol"
 
@@ -6163,55 +6365,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: 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:174
+#: 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:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, 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:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: namə'lum səbəb"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "_Virtual Qovluq Sehirbazı ..."
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6258,17 +6460,17 @@ msgstr "Bacarılmayan İsmarıc %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 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:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6276,7 +6478,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6291,7 +6493,7 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6310,37 +6512,37 @@ msgstr ""
 "Əyalət: %s\n"
 "Ölkə: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarıc yoxdur"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarıc yoxdur: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, 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:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, 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:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq alına bilmədi: %s: %s"
@@ -6373,59 +6575,59 @@ msgstr "IMAP vericisi cavabı %s mə'lumatını daxil etmir"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı alındı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "İsmarıclar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Bu ismarıc hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "İsmarıclar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarıc gövdəsi tapıla bilmədi"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c: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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 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:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Yeni ePoçt üçün baxılır"
 
@@ -6433,7 +6635,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -6467,28 +6669,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, 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:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6499,95 +6701,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Xüsusi Cərgələr"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Standart mbox şəklindəki məktubların saxlanması üçün"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Bu vericinin GƏLƏNLƏR qutusundaki ismarıclara süzgəv əlavə et"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, 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:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 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:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
@@ -6598,23 +6803,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarıc əlavə edə bilmədim: namə'lum səbəb"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Bacarılmayan İsmarıc %d"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarıc məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6623,20 +6833,20 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Belə bir ismarıc yoxdur"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarıc mövtəviyyatı"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6645,15 +6855,15 @@ msgstr ""
 "`%s' qovluğu açıla bilmir: \n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6662,19 +6872,19 @@ msgstr ""
 "`%s' qovluğu yaradıla bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' məktub qovluğu faylı deyildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
@@ -6691,29 +6901,34 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Məktub cərgəsi qovluğu cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Əməliyyat ləğv edildi"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarıc mbox fayllına əlava edilə bimir: %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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6722,17 +6937,17 @@ msgstr ""
 "İsmarıc alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6741,7 +6956,7 @@ msgstr ""
 "`%s' Faylı açıla bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6750,14 +6965,14 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir fayl deyildir ."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6766,109 +6981,117 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyildir. Silinmədi."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "`%s' qovluğu açıla bilmir: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yeri yaxınlığında %s qovluğunda ciddi məktub darama xətası"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "`%s' Faylı açıla bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da əlbətdə"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namə'lum xəta: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Əlaqəyə yeni bir ismarıc göndər"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluğuna ismarıc əlavə edilə bilmir: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' qovluq deyildir."
@@ -6878,135 +7101,118 @@ msgstr "`%s' qovluq deyildir."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH cərgə cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Qovluq Cəmləşdirilir"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Qovluq açıla bilmir: %s:%ld yerindən yığcamlaşdırılır: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Qovluq yığcamlaşdırıla bilmir: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Müvəqqəti məktub faylı %s açıla bilmir: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "%s yüklənə bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s üçün parolu lütfən girin"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Verici istifadəçi adını qəbul etmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "%s ismarıcı tapıla bilmədi"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Vericidən qrup adı öyrənilə bilmədi."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "USENET xəbər qruplarına göndərilmiş hər hansı bir xəbəri oxumaq üçün bir "
 "vasitədir."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Xəbər vericisi üçün qovluq açıla bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dən) USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7014,73 +7220,73 @@ msgstr ""
 "Bu seçənək NNTP verisici ilə düz mətn şəklindəki parol ilə ünsiyyət "
 "quracaqdır."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s üçün .newsrc faylı açıla bilmir ya da yaradıla bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Seçili ismarıcları sil"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "İsmarıc alına bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarıc yoxdur"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarıcı alınır"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "İsmarıc saxlanması"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "İsmarıcları Vericidə burax"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -7089,7 +7295,7 @@ msgstr ""
 "quracaqdır.Bu bir çox məktub vericisi tərəfindən dəstəklənən yeganə "
 "seçənəkdir."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -7099,33 +7305,33 @@ msgstr ""
 "quracaqdır. Bu seçənək bütün vericilər tərəfindən bütün istifadəçilər üçün "
 "dəstəklənməz."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət quracaqdır."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Vericiyə bağlana bilmirəm: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7134,12 +7340,12 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Namə'lum)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7147,7 +7353,7 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstənən tanıtma protokoluna dəstək verilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7156,22 +7362,22 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -7179,174 +7385,174 @@ msgstr ""
 "Yerli sistemdəki \"sendmail\" proqramı istifadə edilərək məktub göndərmək "
 "üçün."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub göndərilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "İsmarıc göndərilə bilmədi: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s işə salına bilmir: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d halı ilə bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "İsmarıcda 'Göndərən' ünvanı tapıla bilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub göndərmək "
 "üçün.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Sistem vəziyyəti və ya kömək cavabı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Kömək İsmarıcı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmət uyğun deyildir, nəqliyyat kanalları bağlanır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Sorğulanan məktub gedişi müvəffəqiyyətlidir, qurtardı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "İstifadəçi yerli deyil; <çatdırma cığırı>na çatdırıram"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Sorğulanan məktub gedişi alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorğulanan gediş alınmadı; uyğunsuz sistem daxılı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Sorğulanan məktub gediş ləğv edildi; daxıl dolmuşdur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu adı qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Məktub alımı başladı; <CRLF>.<CRLF> ilə sonlandırın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorğulanan tanıtma mexanizması üçün kriptləmək lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Xoş gəldin ismarıcı cavab xətası: %s: ağır deyil dəyəsən"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7357,171 +7563,171 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "İsmarıc göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "İsmarıc göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO istək vaxtı doldu: %s: ağır deyil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cavablama xətası: %s. ağır deyil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCTP TO cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA göndərmə vaxt dolması: ismarıc qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA cavablama xətası: ismarıc qurtarılması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUİT istək vaxt dolması: %s: ağır xəta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUİT cavablama xətası: %s: ağır deyil"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "İsmarıca bir fayl əlavə et"
 
@@ -7553,52 +7759,52 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "İsmarıcın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İsmarıcın nüsxəsinin göndəriləcəyi ünvanlar"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7611,37 +7817,37 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bir fayl yapışdır"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Xəbərdarlıq"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7649,17 +7855,17 @@ msgstr ""
 "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
 "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP vericisindən ismarıclar alına bilmədi: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7668,7 +7874,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7677,7 +7883,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7686,7 +7892,7 @@ msgstr ""
 "İsmarıcların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7695,7 +7901,7 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7705,29 +7911,40 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Çatdırılmış ismarıc"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "_Mətn faylını daxil et ... "
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Bir ismarıc yaz"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Dialoq qutusunu yarada bilmədim ."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub parçasındakı\n"
+"heç bir qurǧulari, aparmamısınız."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7735,11 +7952,11 @@ msgstr ""
 "Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub parçasındakı\n"
 "heç bir qurǧulari, aparmamısınız."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7795,15 +8012,24 @@ msgstr "Ad daxil edən"
 msgid "Subject does not contain"
 msgstr "daxil etmir"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Bu parolu yadda saxla"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -7862,30 +8088,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -8025,7 +8251,7 @@ msgstr "Onda"
 msgid "Add action"
 msgstr "Gediş əlavə et"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -8034,16 +8260,16 @@ 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:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Qovluq URIsini Bildirin"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
@@ -8060,39 +8286,39 @@ msgstr ""
 msgid "Test"
 msgstr "Sınaq"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Qayda adı :"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Kriteriya əlavə et"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "gedən"
 
@@ -8286,7 +8512,7 @@ msgstr "Cavab verilən"
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Göndərən"
 
@@ -8319,7 +8545,7 @@ msgstr "başlayır"
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Mövzu"
@@ -8332,15 +8558,15 @@ msgstr "sonra idi"
 msgid "was before"
 msgstr "əvvəl idi"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Qaydalar"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Qaydanı Düzəlt"
 
@@ -8348,48 +8574,48 @@ msgstr "Qaydanı Düzəlt"
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "Məktub taşkilatcısı 'Evolution' parçası."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Alınır"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "sonlanır"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" Göndərilir"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "ePoçt"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 #, fuzzy
 msgid ""
 "Evolution has found Elm mail files\n"
@@ -8398,21 +8624,16 @@ msgstr ""
 "Evolution Elm məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Kart: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "Ünvan dəftəri əlavə et"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 #, fuzzy
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -8421,26 +8642,26 @@ msgstr ""
 "Evolution Netscape  məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP qovluğu daranır"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "_Başlama Tarixi"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "Qurğular..."
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8448,11 +8669,11 @@ msgstr ""
 "Evolution Netscape  məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8460,7 +8681,7 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Çap Et"
@@ -8498,255 +8719,260 @@ msgstr "Məktub Mündəricatı parçası e'malatxanası."
 msgid "Mail configuration interface"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Virtual Qovluqlar"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Virtual Qovluqlar"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Vericiyə bağlana bilmirəm: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "_Seçənəklər..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Faylların seçənəklərini təkmilləşdir"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Məktub İsmarıcı"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Məktub İsmarıcı"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Silinən"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniyə"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d saniyə"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "İsmarıcdan Qayda _Yarat"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "İsmarıcları _Fərqli Qeyd Et ..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarətlə"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Vacib"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Ünvan dəftəri əlavə et"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "İsmarıcdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Ə_sas"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8770,18 +8996,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "'Outlook Express 4' fayllarını 'Evolution' içinə gətirir."
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "daxil edir"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Hazırkı Saxlama Şəkli:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "_İndeks"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Məktub Qutusu Şəkli"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Yeni saxlama şəkli"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8791,15 +9027,15 @@ msgstr ""
 " (disk sahəsi çatışmamazlığındakı kimi) avtomatik olaraq \n"
 "bərpası mümkün olmaya bilər. Bu xüsusiyyəti ehtiyatlı işlədin."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "məktub qovluğu"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8818,19 +9054,19 @@ msgstr "Evolution Hesab Düzəldicisi"
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "%s imza faylı açıla bilmədi:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "Imza faylı : "
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8841,7 +9077,7 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8857,55 +9093,55 @@ msgstr "Bağla"
 msgid "Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Geri Qaytar"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Bunu əsas hesab olaraq göstər"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_Məktub Qurğuları..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "%s a(ə) məktub göndər"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s dir(dır)"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Məktub %s dandır(dəndir)"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8917,7 +9153,7 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8925,7 +9161,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8933,23 +9169,23 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir ePoçt\n"
 "nəqliyyatını qurmalısan."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "ePoçt göndər"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8957,61 +9193,61 @@ msgstr ""
 "Bu ismarıcın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 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:617
+#: mail/mail-callbacks.c:599
 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:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Namə'lum xəta"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "İsmarıc(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "İsmarıc(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, 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:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9019,7 +9255,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarıcları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -9027,28 +9263,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:1692
+#: mail/mail-callbacks.c:1810
 #, 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:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Heç İsmarıc Seçilmədi"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "İsmarıcı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "İsmarıcları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9056,12 +9292,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9070,20 +9306,20 @@ msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "_Süzgəclər ..."
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "İsmarıcı Çap Et"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, 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?"
@@ -9141,17 +9377,17 @@ msgstr ""
 "olacaktır. Lütfən, aşağıdakı boşluğa bu hesab üçün bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Sehirbazı"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesab"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9162,16 +9398,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "mbox"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
@@ -9190,31 +9426,31 @@ 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:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Hesablar"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9226,29 +9462,26 @@ msgid "Authentication"
 msgstr "Tanıtma"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Kimlik Yoxlama Növü: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Yeni ePoçt üçün baxılır"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Yaz"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9264,246 +9497,249 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Ekran"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Lahiyələr"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Lahiyələr cərgəsi:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Düzəlt..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "_Xətdə"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Məktub Qutusu Şəkli"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "Bunu əsas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP Vericisi"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Xəbərlər"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, 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:60
+#: mail/mail-config.glade.h:57
 #, 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:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotalanmış"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Bu parolu yadda saxla"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "İstənən Mə'lumatlar"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fayl seç"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Göndərildi"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Göndərilən ismarıclar cərgəsi:"
+
+#: 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:77
-msgid "Sent messages folder:"
-msgstr "Göndərilən ismarıclar cərgəsi:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Verici tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
-msgstr "Verici Növü: "
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server requires _authentication"
-msgstr "Verici tanıtmaya ehtiyac hiss edər"
+msgid "Server _Type: "
+msgstr "Verici Növü: "
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (_SSL)"
+msgid "Use s_ecure connection (SSL)"
 msgstr "E'tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9514,120 +9750,143 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Kimlik Yoxlama Növü: "
+
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr "ePoçtları avtomatik yoxla:"
 
 #: mail/mail-config.glade.h:95
+msgid "_Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
 #, fuzzy
-msgid "_Check for supported types"
-msgstr " Dəstəklənən növləri yoxla "
+msgid "_Drafts folder:"
+msgstr "Lahiyələr cərgəsi:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Tam Ad:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Sitatları Rəngləndir: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "Ev Sahibi:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "İsmarıcları bundan sonra \"Oxundu\" olaraq işarətlə: "
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "Ad :"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Orqanizasiya"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Yol:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Bu parolu yadda saxla"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Əsas olaraq ePoçtu HTML Şəklində göndər"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Verici Növü: "
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "İstifadəçi adı :"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Hər"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "İzah :"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "saniyə."
 
@@ -9675,161 +9934,156 @@ msgstr "Dialoq qutusunu yarada bilmədim ."
 msgid "Could not create a S/MIME decode context."
 msgstr "Dialoq qutusunu yarada bilmədim ."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Diskə Qeyd Et ..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Gizlət"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "İsmarıc içindəkilər yüklənir"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Körpünü səyyahda aç"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Ünvanı köçür"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Fərqli qeyd et"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Fərqli qeyd et ..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarıcı açıla bilmədi: Mənbə kodu gösteriliyor."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "Cavab ver"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "Heç GPG/PGP proqramı qurulmayıb."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "Kodlanmış ismarıc göstərilmədi"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "Kodlanmış İsmarıc"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Bu ismarıc digital olaraq imzalanmışdır və original olduğu düşünülür."
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "Kodu açmaq üçün timsala basın."
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Bu cür təqvim parçasından başım çıxmır."
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 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:1464
+#: mail/mail-format.c:1838
 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:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, 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:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, 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:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9838,29 +10092,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:708
+#: mail/mail-local.c:763
 #, 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:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9868,17 +10122,17 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 #, 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:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Quraşdır"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9887,7 +10141,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9896,26 +10150,7 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Bu parolu yadda saxla"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "%s üçün parol girin"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "%s üçün parol girin"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "İşləyir"
 
@@ -9924,122 +10159,115 @@ msgstr "İşləyir"
 msgid "Filtering Folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarıc göndərilir"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarıcda xəta"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "İsmarıclar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarıclar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarıclar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"Faylları `%s''yə\n"
-"köçürdə bilmədim ."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Daşınır"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Köçürdülür"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarıcı alınır"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "İsmarıclar alınır"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "İsmarıclar qeyd edilir"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -10048,7 +10276,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10057,11 +10285,11 @@ msgstr ""
 "İsmarıcların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -10070,17 +10298,17 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Vericiyə bağlantı qurulur..."
@@ -10089,109 +10317,119 @@ msgstr "Vericiyə bağlantı qurulur..."
 msgid "_Search"
 msgstr "A_xtar"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "( Adsız )"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Çoxlu İsmarıc"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "İsmarıcı Düzəlt"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "İsmarıcı Düzəlt"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "Çatdır"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Find:"
 msgstr "Axtar"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "Yol:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici Növü: "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Növ:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "ePoçt Göndər və Al"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Ləğv Edildi"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 #, fuzzy
 msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "Gözlənilir ..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "%s üçün parol girin"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "%s üçün parol girin"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarıc - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s qovluğu açılır"
@@ -10201,7 +10439,7 @@ msgstr "%s qovluğu açılır"
 msgid "Updating vfolders for uri: %s"
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10210,30 +10448,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "VFolderləri Düzəlt"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "Dvm: (mövzusuz)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "İsmarıc"
@@ -10294,7 +10532,7 @@ msgstr "%a %l %M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "İsmarıclar qeyd edilir"
@@ -10321,27 +10559,27 @@ msgstr "\"%s\" dakı qovluqlar daranır"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Heç İsmarıc Seçilmədi"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 #, fuzzy
 msgid "Please select a server."
 msgstr "Xidmæt seç"
@@ -10387,134 +10625,129 @@ msgstr "Qeydiyyatdan Çıx"
 msgid "Evolution component for the executive summary."
 msgstr "İcracı mündəricat üçün 'Evolution' parçası."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: 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/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Görüşlər"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "Görüşləri göstər"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "Poçt Mündəricatı"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Ad :"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Xülasə daxil edən"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: 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:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "_Yeni Qovluq"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "Vəzifələri göstər"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "İzah :"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Başqa"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "Bölmələr :"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%a %B %d %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Mündəricat"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
@@ -10576,7 +10809,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10657,1091 +10890,1096 @@ msgstr "Ən Alçaq"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "Göstər"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 #, fuzzy
 msgid "Rain"
 msgstr "Radio"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 #, fuzzy
 msgid "Drifting rain"
 msgstr "İzah daxil edən"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Yenidən Axtar"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "indi"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 #, fuzzy
 msgid "Moderate snow"
 msgstr "İndi güncəllə"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "İzah daxil edən"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "ePoçt"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "İlk ePoçt ünvanı"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "E-poçt Alınır"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Namə'lum tanıtma vəziyyəti."
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Namə'lum xəta"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Görüş Dəvətləri"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 #, fuzzy
 msgid "Mist"
 msgstr "Miss"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "Portret"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Məktublaşma qrupu"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Bu pəncərəni qapat"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "Xal"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Vəzifələri göstər"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Ediləcəklər"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Bu pəncərəni qapat"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Ediləcəklər"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr ""
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "Göndər"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Başlıq"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "gün"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "İndi güncəllə"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Hamısını Göstər"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Portret"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
-msgstr ""
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
+msgstr "İzah daxil edən"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Yenidən Axtar"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "Avqust"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Ediləcəklər"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 #, fuzzy
 msgid "Thunderous tornado"
 msgstr "Ediləcəklər"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11752,7 +11990,7 @@ msgstr "Sil"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Cavab cerilmiş"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11770,12 +12008,12 @@ msgstr "Qovluqlar"
 msgid "All news _feeds:"
 msgstr "Cavab cerilmiş"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11820,16 +12058,13 @@ msgid "Show _today's tasks"
 msgstr "Vəzifələri göstər"
 
 #: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Tasks "
-msgstr "Vəzifə"
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"   Bölmə:\t"
+msgid "Tasks "
+msgstr "Vəzifə"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
@@ -11852,14 +12087,13 @@ msgid "_Displayed feeds:"
 msgstr "Ekran"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_Five days"
-msgstr "Cümə"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "_Imperial"
-msgstr "Aprel"
+msgid "_Five days"
+msgstr "Cümə"
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
@@ -11902,26 +12136,26 @@ msgstr "Ətraflı"
 msgid "Cancel Operation"
 msgstr "Görüşü Ləğv Et"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 #, fuzzy
 msgid "Inbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution qurulması"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11929,17 +12163,17 @@ msgstr ""
 "Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
 "bə'zi əlavə fayllar köçürməlidir"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Lütfən \"Oldu\"'ya tıqlayıb, faylları qurun, ya da \"Ləğv Et\"ə basaraq "
 "çıxın."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Fayllar düzgün güncəllənə bilmədi"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11950,14 +12184,14 @@ msgstr ""
 "\n"
 "Xəta : %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Faylı oxurkən bir xəta oldu ."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11968,7 +12202,7 @@ msgstr ""
 "\"Evolution\" istifadəçi fayllarınin qurulması\n"
 "üçün onu sil."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11977,7 +12211,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11988,6 +12222,19 @@ msgstr ""
 "\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
 "istifadəçi fayllarınin qurulması üçün onu sil."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -12004,27 +12251,27 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "Qovluğa Köçürt"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "Qovluğa Köçür"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -12033,18 +12280,18 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Sil"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 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?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -12053,16 +12300,22 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "%s qovluğu açılır"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Bildirilən qovluq adı hökmlü deyildir ."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -12072,34 +12325,11 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Alıcı bildirilməyib"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Bildirilən qovluq adı hökmlü deyildir ."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -12107,19 +12337,19 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -12133,13 +12363,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
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12150,7 +12380,7 @@ msgstr ""
 "Alıcı hazır deyil.\n"
 "Yenidən sınamaq üçün 5 saniyə gözlənir."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12159,16 +12389,16 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur ."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -12177,11 +12407,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12190,17 +12420,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12209,141 +12439,149 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, 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
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Göndərən:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Al"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Alıcı bildirilməyib"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: 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 "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:239
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"\"Evolution\" GNOME masa üstü üçün gözəl bir ePoçt, \n"
-"təqvim və əlaqələr idarə proqramıdır."
+msgid "About Ximian Evolution"
+msgstr "\"Evolution\" Haqqında..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "Xətdə İşlə"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Xətdən Qopuq İşlə"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -12351,46 +12589,36 @@ msgstr "Xətdən Qopuq İşlə"
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "( Adsızdır )"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12398,37 +12626,33 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Oldu"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Hökmsüz ismarıc mövtəviyyatı"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Qrup adı :"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12437,124 +12661,124 @@ msgstr ""
 "`%s' Qrupunu qısa yol çubuğundan həqiqətən \n"
 "də silmək istəyisiniz?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Silmə"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlət"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlət"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Güncəl ismarıcları yeni pəncərədə aç"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Qayda adı :"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Sil"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Qısa yolları qeyd edərkən xəta oldu."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 #, fuzzy
 msgid "Shortcuts"
 msgstr "_Qısa Yol Çubuğu"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12563,65 +12787,171 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "( Adsızdır )"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 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:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% _Qurtardı:"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "G/Ç xətası"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "Hökmsüz ismarıc mövtəviyyatı"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Yoxdur"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Fayl tapıla bilmədi"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr " Dəstəklənən növləri yoxla "
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "İstifadəçi əməliyyatı ləğv etdi."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "G/Ç xətası"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "Mövcuddur"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Təqvim"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "%s deyə bir qovluq yoxdur"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Heç İsmarıc Seçilmədi"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Namə'lum xəta"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12729,86 +13059,73 @@ msgstr ""
 "Bu vasitə ila xarici faylları \"Evolution\" içinə\n"
 "alacaqsınız."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 #, fuzzy
 msgid "Importers"
 msgstr "Al"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 #, fuzzy
 msgid "Don't import"
 msgstr "Silmə"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Mənə bir də soruşma"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Məktub taşkilatcısı 'Evolution' parçası."
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Məktub Qurğuları..."
 
-#: shell/main.c:162
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Salam. \"Evolution\" NÜMAYİŞ buraxılışını sınamağa \n"
-"vaxt tapdığınız üçün minnətdarıq.\n"
-"\n"
-"\"Evolution\" hələ tamamilə azyılmayıb. Düzdür artıq sona çatırıq.\n"
-"Amma hələ də ediləcək bə'zi işlər var.\n"
-"\n"
-"Ağır bir işin nəticəsini bəyəndiyinizi ümid edib, sizin fikirlərinizi\n"
-"gözləyirik!\n"
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Minnətdarıq\n"
-"\"Evolution\" Dəstəsi\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "\"Evolution\" qabığını başlada bilmədim ."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "\"Evolution\" qabığını başlada bilmədim ."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün xəta ayıqlama verilənlərini bir fayla yazdır."
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Fayl yüklərkən xəta oldu: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Faylı aç"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "_Mətn faylını daxil et ... "
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Alıcı bildirilməyib"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12908,7 +13225,7 @@ msgstr "Yükləməni Dayandır"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Gedişlər"
@@ -12932,7 +13249,7 @@ msgid "_Forward Contact..."
 msgstr "_Əlaqələr ..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Çap Et ..."
@@ -12983,7 +13300,7 @@ msgstr "Gün"
 msgid "Delete the appointment"
 msgstr "Bu iclası sil"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Get"
 
@@ -13120,11 +13437,12 @@ msgstr "Çap Et ..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Qeyd Et"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Qeyd Et və Qapat"
 
@@ -13142,7 +13460,7 @@ msgstr "Görünüşü %s a(ə)dəyişdir"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fayl"
@@ -13164,7 +13482,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
@@ -13237,11 +13555,6 @@ msgstr "Görüş Cədvəli"
 msgid "Customise My Evolution"
 msgstr "%s - Evolution %s"
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "Ləğv Edildi"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13520,329 +13833,359 @@ msgstr "İsmarıcdan _Virtual Qovluq Yarat"
 msgid "Create a virtual folder for this subject"
 msgstr "İsmarıcdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "İsmarıcı göndərene cavab ver"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "Sonrakı ismarıca get"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Əvvəlki ismarıca get"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Əvvəlki ismarıca get"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Əvvəlki ismarıca get"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı Süzgəc"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Gö_ndərənə görə Süz"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Alı_cıya görə Süz"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Möv_zuya  görə Süz"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Çatdır"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Fərqli Çatdır"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Fərqli Çatdır"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "_Həmən çatdır"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "_Həmən çatdır"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "_Mətn faylını daxil et ... "
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "Çatdırılmış ismarıc"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Vacib"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "İsmarıcı əvvəl oxunmamış olaraq İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "İsmarıcı əvvəl oxunmamış olaraq İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Daşı"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Seçili ismarıcları başqa bir cərgəyə daşı"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "İrəli"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Sonrakı İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "Sonrakı İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "İl_gəyi Seç"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "Sonrakı İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Güncəl ismarıcları yeni pəncərədə aç"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "İşarətlə"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Əvvəlki"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "İsmarıcı Çap Et"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Hamısına cavab ver"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "İsmarıcı A_xtar"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "İsmarıcı yeni bir fayla qeyd et"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "_Tam Başlıqlar"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Gün %s şəklində girilməlidir."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "İsmarıca bir fayl əlavə et"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarıcı silmə"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Gön_dərəndəki vFolder"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcıdakı vFolder"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "_Mövzudakı vFolder"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "Süzgəcləri Ə_lavə Et"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "İsmarıcdan Qayda _Yarat"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Çatdırılmış ismarıc"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Peycer"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "İsmarıclar"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Ekran"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "İ_smarıcları Yenidən Göndər"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Vasitələr"
@@ -13853,7 +14196,7 @@ msgstr "Bu pəncərəni qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Qapat"
@@ -13885,11 +14228,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "Şəki_l"
+#, fuzzy
+msgid "For_mat"
+msgstr "Şəkil"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13939,7 +14284,7 @@ msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Hazırkı faylı qeyd et"
 
@@ -14035,7 +14380,7 @@ msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Daxil Et"
 
@@ -14051,7 +14396,7 @@ msgstr "_Cavab_Verləcək Girişi"
 msgid "_Security"
 msgstr "_Təhlükəsizlik"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -14318,11 +14663,6 @@ msgstr "_Qısa Yol Çubuğu"
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Work Offline"
-msgstr "Xətdən Qopuq İşlə"
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -14404,140 +14744,144 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Görünüşləri Müəyyənləşdir"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Bugün"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Gün %s şəklində girilməlidir."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+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"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "həftə"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Turkish"
 msgstr "Zibil Qutusu"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 #, fuzzy
 msgid "New"
 msgstr "Xəbərlər"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "Başqa"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "Əlaqə düzəldicisi"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Tə_mizlə"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Hamısını Göstər"
 
@@ -14581,19 +14925,177 @@ 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:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME başladıla bilmədi"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #, fuzzy
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "\"Evolution\" haqqında mə'lumat göstər"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "%A %b %d %Y %H:%M'də bildir"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Namə'lum xəta"
+
+#, fuzzy
+#~ msgid "_Invite Others"
+#~ msgstr "Başqalarını _Dəvət Et ..."
+
+#~ msgid "_Confidential"
+#~ msgstr "_Gizli"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "İzah :"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Qovluq Cəmləşdirilir"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Qovluq açıla bilmir: %s:%ld yerindən yığcamlaşdırılır: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Qovluq yığcamlaşdırıla bilmir: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Kart: "
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Heç GPG/PGP proqramı qurulmayıb."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Kodlanmış ismarıc göstərilmədi"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Kodlanmış İsmarıc"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Kodu açmaq üçün timsala basın."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "Faylları `%s''yə\n"
+#~ "köçürdə bilmədim ."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Evolutionun İcracı Mündəricat parçasını başlada bilmədim ."
+
+#, fuzzy
+#~ msgid "Units: "
+#~ msgstr ""
+#~ "\n"
+#~ "   Bölmə:\t"
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "Aprel"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "\"Evolution\" GNOME masa üstü üçün gözəl bir ePoçt, \n"
+#~ "təqvim və əlaqələr idarə proqramıdır."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Salam. \"Evolution\" NÜMAYİŞ buraxılışını sınamağa \n"
+#~ "vaxt tapdığınız üçün minnətdarıq.\n"
+#~ "\n"
+#~ "\"Evolution\" hələ tamamilə azyılmayıb. Düzdür artıq sona çatırıq.\n"
+#~ "Amma hələ də ediləcək bə'zi işlər var.\n"
+#~ "\n"
+#~ "Ağır bir işin nəticəsini bəyəndiyinizi ümid edib, sizin fikirlərinizi\n"
+#~ "gözləyirik!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Minnətdarıq\n"
+#~ "\"Evolution\" Dəstəsi\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "Şəki_l"
+
+#, fuzzy
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "%s üçün %s parol kalimanizi lürfən girin"
 
@@ -14620,10 +15122,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "Vaxsey! `%s' nümayişi gözlənilməz şəkildə sonlandı. :-(\n"
 #~ "Bu, %s qisminin çökdüyünə işarət edir."
 
-#, fuzzy
-#~ 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."
 
@@ -14836,19 +15334,12 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %m/%d/%Y"
 
-#, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
 #~ msgid "Elm mail"
 #~ msgstr "Elm Poçtu"
 
 #~ msgid "Pine mail"
 #~ msgstr "Pine Poçtu"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "'Evolution'un məktub parçası e'malatxanası."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Bu ismarıcı çatdır:\n"
 
@@ -14998,13 +15489,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Delegated From:"
 #~ msgstr "Silinən"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "Yoxdur"
-
-#~ msgid "Task"
-#~ msgstr "Vəzifə"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% _Qurtardı:"
 
@@ -15162,9 +15646,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "_Əlaqələr"
 
-#~ msgid "_Index"
-#~ msgstr "_İndeks"
-
 #~ msgid "_Mail message"
 #~ msgstr "_Məktub İsmarıcı"
 
@@ -15218,9 +15699,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Find..."
 #~ msgstr "Tap..."
 
-#~ msgid "Open calendar"
-#~ msgstr "Təqvimi aç"
-
 #~ msgid "Save calendar"
 #~ msgstr "Təqvimi qeyd et"
 
@@ -15260,9 +15738,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Edit Task"
 #~ msgstr "Vəzifəni Düzəlt"
 
-#~ msgid "Percent complete"
-#~ msgstr "Faiz Qurtardı"
-
 #~ msgid "Mark the task complete"
 #~ msgstr "Vəzifə qurtarmasını işarətlə"
 
@@ -15293,15 +15768,9 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Komponenet müvəffəqiyyətlə silindi."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Bu cür təqvim parçasından başım çıxmır."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Təqvimə Əlavə Et"
 
-#~ msgid " Tentative "
-#~ msgstr " Girişimli"
-
 #~ msgid "Update Calendar"
 #~ msgstr "Təqvimi Güncəllə"
 
diff --git a/po/bg.po b/po/bg.po
index 39ae410fab..81cf19bb47 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -14,6 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -22,305 +30,310 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 #, fuzzy
 msgid "File As"
 msgstr "���� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "�������"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "��������"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "�������"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "���. ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "���. ����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "������� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "������ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "������ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "�����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "���� ����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�������"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "�����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Web ��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "������(�)"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Free-busy �����"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "���������:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "���� �� �������: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "����� ���:"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -328,19 +341,19 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -348,19 +361,19 @@ msgstr ""
 "\n"
 "  ������������: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -368,7 +381,7 @@ msgstr ""
 "\n"
 "���� �� �������: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -376,7 +389,7 @@ msgstr ""
 "\n"
 "�����:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -384,13 +397,13 @@ msgstr ""
 "\n"
 "  �������� �����:"
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -398,7 +411,7 @@ msgstr ""
 "\n"
 "   �����:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -406,7 +419,7 @@ msgstr ""
 "\n"
 "  ����:        "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -414,7 +427,7 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -422,7 +435,7 @@ msgstr ""
 "\n"
 " �������� ���: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -430,13 +443,13 @@ msgstr ""
 "\n"
 "  �������:     "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -444,7 +457,7 @@ msgstr ""
 "\n"
 "  ��������:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -452,25 +465,25 @@ msgstr ""
 "\n"
 "  �������:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -478,7 +491,7 @@ msgstr ""
 "\n"
 "������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -486,19 +499,19 @@ msgstr ""
 "\n"
 "���������� ���������������: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -506,7 +519,7 @@ msgstr ""
 "\n"
 "   ���:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -514,7 +527,7 @@ msgstr ""
 "\n"
 " ������: "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -522,7 +535,7 @@ msgstr ""
 "\n"
 " ������2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -530,7 +543,7 @@ msgstr ""
 "\n"
 " ������3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -538,7 +551,7 @@ msgstr ""
 "\n"
 " ������4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -546,7 +559,7 @@ msgstr ""
 "\n"
 " ���������: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -564,7 +577,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -572,7 +585,7 @@ msgstr ""
 "\n"
 "�������� ���: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -580,11 +593,11 @@ msgstr ""
 "\n"
 "�������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "���������� ������ �� %s"
@@ -593,87 +606,89 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "���������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "��������� �� �������..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "��������� ��� �������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "����������� �� ��������������� ��� �� ������� ���������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "��������� ��� �������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor �� ���� �� ���� �������\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook �� � �������\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "�� ���� �� ��������� wombat ������"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "�� ���� �� ��������� wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -717,46 +732,46 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "��� �������"
@@ -791,7 +806,7 @@ msgid "Base"
 msgstr "����"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "����"
@@ -876,16 +891,16 @@ msgstr "��� �� �����:"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "���_���"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_��������"
@@ -905,22 +920,28 @@ msgstr "����:"
 msgid "_Server name:"
 msgstr "��� ������:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "�� ���� �� ������������� Bonobo"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -928,50 +949,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ �� %s"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "����� ���� �������"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "Email �������"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "���������"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "���������:"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -985,56 +1006,56 @@ msgstr ""
 msgid "(none)"
 msgstr "(���� ���)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "������� Email"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "������ ����"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "������ ��� �������"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "������ � ��������� �����"
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E-Mail �����:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 #, fuzzy
 msgid "Disable Queries"
 msgstr "�������."
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -1046,53 +1067,62 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 #, fuzzy
 msgid "Remove All"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "������� email"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "��������� ����������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "��� �������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1158,12 +1188,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "�������� �� ��������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�������"
 
@@ -1233,9 +1263,9 @@ msgstr "��������..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "������"
@@ -1304,40 +1334,50 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "��������� �� �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 #, fuzzy
 msgid "Edit Full"
 msgstr "���������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Full Name"
 msgstr "����� ���:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "�-��"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2453,7 +2493,7 @@ msgid "contact-list-editor"
 msgstr "�������� �� ��������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "�������� �� ��������"
@@ -2502,154 +2542,161 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "������ ������"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "�� � ���������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " %d �������"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "������� ����������� ��-�����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "������� ���������..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "������ ��� ����������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "������ �� � �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "������/������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "������ �� �� ��������� ���������?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "������ ��� ����������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "������ ��� ����������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "������ ��� ����������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "������ ��� ����������� �� %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2659,7 +2706,7 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2667,85 +2714,94 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<��������� ��� �� �� �������� ����>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 #, fuzzy
 msgid "Primary Phone"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 #, fuzzy
 msgid "Business Phone"
 msgstr "������ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Business Address"
 msgstr "������ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Home Address"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "������ 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Other Phone"
 msgstr "����� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 #, fuzzy
 msgid "Other Address"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "������ � ��������� �����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2933,97 +2989,110 @@ msgstr "��������:"
 msgid "_Font..."
 msgstr "�����..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "��������� ����������"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "��������� ����������"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "������� �������"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "���������� �����"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "������������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ������������� � ����������� ������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ���� �� ������� ��������� �� pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "�� ���� �� ������� �������� ��� ������ �� pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
+msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
@@ -3035,49 +3104,28 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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: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: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:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
-msgid "Notification about your appointment"
-msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
-
-#: 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"
+msgid "Starting:"
+msgstr "���������"
 
-#: 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:218
+msgid "Ending:"
+msgstr ""
 
-#: 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:231
+msgid "invalid time"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 #, fuzzy
-msgid "Notification about your task"
-msgstr "������ ���������� ������� Evolution"
+msgid "Evolution Alarm"
+msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: 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"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "������"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3099,12 +3147,12 @@ msgstr "����� �� �������� (������)"
 msgid "_Edit appointment"
 msgstr "���������� �����"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 #, fuzzy
 msgid "No description available."
 msgstr "���� ���������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3112,7 +3160,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3123,140 +3171,118 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "�� ���� �� ������������� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "�� ���� �� ������������� Bonobo"
+msgid "Could not create the alarm notify service"
+msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr ""
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
 "OAF"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "�� � ���������"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "� �������"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "����������"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"������ ������ �� � �������� � ������� ������: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3266,58 +3292,61 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "���������� �� ���������� ������ �� � ����� 0 � 100, �����������"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 #, fuzzy
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 #, fuzzy
 msgid "No"
 msgstr "����"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "���������..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "_������"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "������� �������"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "�������"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "�����"
@@ -3337,12 +3366,12 @@ msgstr "��������:"
 msgid "Comment contains"
 msgstr "��� �������"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "��������"
 
@@ -3350,9 +3379,9 @@ msgstr "��������"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
@@ -3361,26 +3390,26 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "������"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ����� �� �� ������� � ���������"
 
@@ -3456,52 +3485,52 @@ msgstr "������"
 msgid "minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d ���"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr " 1 ���"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d �������"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr " 1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 ���"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d �������"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " 1 �������"
@@ -3561,17 +3590,12 @@ msgstr " ���� ���� �� �������"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s ������ %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3594,7 +3618,7 @@ msgstr "���������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3625,7 +3649,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
@@ -3680,7 +3704,7 @@ msgid "First day of wee_k:"
 msgstr "����� ��� �� ���������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "�����"
 
@@ -3695,7 +3719,7 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "����������"
 
@@ -3705,7 +3729,7 @@ msgid "O_verdue tasks:"
 msgstr "���������� ������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "������"
 
@@ -3730,7 +3754,7 @@ msgid "Su_n"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "������"
 
@@ -3750,7 +3774,7 @@ msgid "Tas_ks due today:"
 msgstr "������, ����� ���� ������ ����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "���������"
 
@@ -3775,12 +3799,12 @@ msgid "Time format:"
 msgstr "������ �� �����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "�������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "�����"
 
@@ -3863,120 +3887,125 @@ msgstr "��"
 msgid "before the start of the appointment"
 msgstr " ���� �������� �� �������"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 #, fuzzy
 msgid " to "
 msgstr "����� �"
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "����������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "����������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "����"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "�� ���� �� ������ �������� ���������"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3984,53 +4013,53 @@ msgstr ""
 "���� ��� ������ ��� ���� ����������.\n"
 "�� �� ��������� ��?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4050,26 +4079,26 @@ msgstr "������"
 msgid "Enter Delegate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "�����"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "�������� �����"
@@ -4089,12 +4118,13 @@ msgid "Classification"
 msgstr "������������"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "��������������"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "��������� �� ����"
@@ -4104,12 +4134,12 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "������"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "��������"
 
@@ -4120,7 +4150,7 @@ msgid "Show Time As"
 msgstr "������ �������"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr ""
 
@@ -4132,32 +4162,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "������..."
@@ -4203,6 +4220,7 @@ msgid "Member"
 msgstr "��������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4221,7 +4239,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -4236,7 +4254,8 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4247,23 +4266,23 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4329,19 +4348,15 @@ msgstr "������(�/�)"
 msgid "year(s)"
 msgstr "�����(�/�)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "������ �� �� ��������� ���������?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4361,7 +4376,7 @@ msgid "Progress"
 msgstr "� �������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4373,142 +4388,173 @@ msgstr "_���������:"
 msgid "_Status:"
 msgstr "_������:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "��������"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "��������:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "������ �������"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "% ����������:"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"������ ������ �� � �������� � ������� ������: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "����������."
@@ -4540,8 +4586,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr ""
 
@@ -4554,335 +4600,416 @@ msgstr "���������"
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "����� � �����..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "������� ������� ����"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "���� �� �������:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "������������� ����������"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "���������� ����������"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "���������� ������"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "������ ����"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "���� ����"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "��������:"
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "������"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "������������� ����������"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "��������� �� �����������"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Free-busy �����"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Free-busy �����"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Cursor �� ���� �� ���� �������\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�� ���� �� ������� ������ ���������� ����!\n"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% ����������:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "��������� �� ����"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4924,86 +5051,102 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "��� �� �����:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "�������� �� ������:"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "������"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "� �������"
@@ -5011,114 +5154,120 @@ 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:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "���� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_�����"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "������ �� �������:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "�������� �� ����� %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "���� �����"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "������ ��������"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "�����"
@@ -5175,237 +5324,286 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30��"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "����� ��� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "������ ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "����� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "������ ������ (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "������"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_������:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_���������:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "����������"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+" ���������: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_��������"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "��������� ��������"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "������� �������"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "������� ���������..."
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "������� ���������..."
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
+"OAF"
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5413,126 +5611,126 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "����������� ������ � ����������� ��� �����������"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5556,7 +5754,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5564,7 +5762,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5572,111 +5770,111 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr ""
 "�� ���� �� ����������� ������� '%s':\n"
 "%s"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d �� %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "_Mail ���������"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 #, fuzzy
 msgid "Cannot open message"
 msgstr "�������� �� �����������"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "���������� ��������� - %s"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "�������� ��������(���/���) �"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5685,187 +5883,187 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "�� ���� �� ������ %s: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(���������� ������)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�� ���� �� ������ �������� ����: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "�� ���� �� ������ %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ���� �� ������ %s: ���� ������������� ��� � ������."
@@ -5885,7 +6083,7 @@ msgid "Connection cancelled"
 msgstr "��������� ����������"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
@@ -5895,12 +6093,12 @@ msgid "(unknown host)"
 msgstr "(���������� ����)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6001,7 +6199,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -6019,8 +6217,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "������"
 
@@ -6049,55 +6247,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6144,17 +6342,17 @@ msgstr "�������� ���� ��� �����������"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6162,7 +6360,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6172,7 +6370,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6184,41 +6382,41 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -6256,62 +6454,62 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "����������� �� �����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "����������� ���� ����.\n"
 "�������� �� �� �� �������?"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "����������� �� �����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "������ ��� email"
@@ -6321,7 +6519,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "�����"
 
@@ -6354,28 +6552,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6383,93 +6581,96 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� `%s'."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH-������ mail ����������"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "�� ���������� �� ������� ���� � qmail maildir ����������"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "�� ���������� �� ������� ���� � ���������� mbox ������"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir-������ mail �������"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH-������ mail ����������"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "�� ���������� �� ������� ���� � qmail maildir ����������"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "���������� Unix mailbox ����"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "�� ���������� �� ������� ���� � ���������� mbox ������"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6480,43 +6681,48 @@ msgid "Could not save summary: %s: %s"
 msgstr "�� ���� �� ������ %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "_Mail ���������"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "�� ���� �� ������ ����������� � maildir �������: %s: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "���� ������ ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6525,15 +6731,15 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "������� `%s' �� ����������."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6542,19 +6748,19 @@ msgstr ""
 "�� ���� �� ������ �����`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' �� � maildir ����������."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "�� � maildir ����������"
 
@@ -6571,46 +6777,51 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "���������� ����������"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "�� ���� �� ������ ����������� � 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6619,7 +6830,7 @@ msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6628,14 +6839,14 @@ msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' �� � ��������� ����."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6644,108 +6855,116 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "������� `%s' �� � ������. �� � �������."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "�������������� �� �����"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ���� �� ������ ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ��� ������ � ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�������� � ��������� mailbox ���������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ���� �� ������� ���������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "���������� ������: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "������� ����������� ��-�����"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mh �������: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' �� � ����������."
@@ -6755,458 +6974,441 @@ msgstr "`%s' �� � ����������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mbox �����: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' �� � ��������� ����."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "������� `%s' �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "�������������� �� �����"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ���� �� ������� ���������� �����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "�� ���� �� ������ %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "���� �������� NNTP ������ �� %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "�������� �������� ��������������� ���"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "����������� �� ��������������� ��� �� ������� ���������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "�������� �������� ��������������� ���/��������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "����������� %s �� � ��������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET ������"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET ������ ���� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "�� ���� �� ������ ��� ������ .newsrc ���� �� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "����� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "���� ��������� � uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "������������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "����������� ���� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "���� ������ �� �������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(����������)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "����������� ������, ��������� �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "����������� ������ � ����������� ��� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "�� ��� ������ ������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Authentication required"
 msgstr "�������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7214,168 +7416,168 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "�������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u �����"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "�������� ���� ��� �����������"
 
@@ -7407,52 +7609,52 @@ msgstr "MIME ���:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7463,52 +7665,52 @@ msgstr ""
 msgid "Attach a file"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "������� ����..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "��������"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7517,7 +7719,7 @@ msgstr ""
 "�� ���� �� ����������� ������� '%s':\n"
 "%s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7526,58 +7728,66 @@ msgstr ""
 "�� ���� �� ����������� ������� '%s':\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "������ ������� ����..."
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "������ ���������"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr ""
 
@@ -7627,15 +7837,24 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "������� ���� ������"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "������ �� %A %b %d %Y %H:%M"
@@ -7687,30 +7906,30 @@ msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7840,22 +8059,22 @@ msgstr "������"
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "������ �����"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<��������� ��� �� �� �������� �����>"
 
@@ -7870,39 +8089,39 @@ msgstr ""
 msgid "Test"
 msgstr "����"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "�����������"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "���"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "��� ������ �������� �� ���������"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "��� ����� �� ���������� � ��������"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "������ ��������"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "������"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "�������"
 
@@ -8104,7 +8323,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "��������:"
 
@@ -8137,7 +8356,7 @@ msgstr "������� �"
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -8150,16 +8369,16 @@ msgstr "���� ����"
 msgid "was before"
 msgstr "���� �����"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "����"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "������ �������"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "������ �������"
@@ -8168,102 +8387,98 @@ msgstr "������ �������"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "������ ����..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "�������� �"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "��������� �� \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr ""
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "������ ������� �����"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "���������"
@@ -8302,265 +8517,270 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "Mail ������������"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "������ ����� Mailing List"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Mail ���������"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Mail ���������"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "��������"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� ����"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "������ ����� ����"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��������"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "���������� �����������"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_������� ����..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "�������� �� ���������"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "�������� ���� ���������"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "�������� ���� �����������"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�����"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "�������� ���� �����������"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "������ ������� �����"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "��������� ������"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "������ �� Mailing ���� (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "������ �� Mailing ���� (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�� ������������"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8583,33 +8803,42 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "������ �������"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "����� ������ �� ����������:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "������ �� ���������� �����"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "��� ������ �� ����������:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr ""
 
@@ -8628,26 +8857,26 @@ msgstr "Evolution - ������ ���� �����"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "������:"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 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:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8664,54 +8893,54 @@ msgstr "�������."
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "���������� �������"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "���������"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "������ � %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8723,35 +8952,35 @@ msgstr ""
 "���������� ��� ������ ����.\n"
 "������ �� �� �� ������������� ����?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "�� �� ������� ������ �� ��������� �� ����"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "������� email"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8759,58 +8988,58 @@ msgstr ""
 "����������� ���� ����.\n"
 "�������� �� �� �� �������?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "������ �� ������������� ������ account �� �� ���� �� ��������� ����."
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "���������� ������"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8818,7 +9047,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -8827,29 +9056,29 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "����������� ���� ��������"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8857,12 +9086,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8871,20 +9100,20 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "���������� ������"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8926,16 +9155,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�������"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8946,17 +9175,17 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 #, fuzzy
 msgid "Checking Service"
 msgstr "��������� ��� �������"
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "��������� ��� �������"
@@ -8975,32 +9204,32 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Accounts"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9013,29 +9242,25 @@ msgstr "�������������"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Authentication Type: "
-msgstr "�������������:"
+msgid "Checking for New Mail"
+msgstr "������ ��� email"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9045,373 +9270,399 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 #, fuzzy
 msgid "Drafts"
 msgstr "����"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Drafts folder:"
-msgstr "��������� �� ���� �����"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "���� �������"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Edit..."
 msgstr "��������"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "�������"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "������ �� ���������� �����"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP ������"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "������"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����������"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Qmail maildir-������ mail �������"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "������� ���� ������"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "������������� ����������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "������ PGP ��������"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Sent"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "������� ����������� ��-�����"
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "������� ����������� ����"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Sent messages folder:"
-msgstr "������� ����������� ��-�����"
+msgid "Ser_ver requires authentication"
+msgstr "�������� ������� authentication"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
-msgstr "��� ������:"
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server requires _authentication"
-msgstr "�������� ������� authentication"
+msgid "Server _Type: "
+msgstr "��� ������:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����������"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mailbox ����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (_SSL)"
+msgid "Use s_ecure connection (SSL)"
 msgstr "���� ������ ������� ���������� ������ (SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "�������������:"
+
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "_Automatically check for new mail"
+msgstr "������ ��� email"
+
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "��������� �� ���� �����"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Email �����:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "����� ���:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "������:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "������:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "�������� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "�����������:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ����������"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "������� ���� ������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "������� mail � HTML ������ �� ������������."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "��� ������:"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "������������ ���:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "�����"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "��������:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "�������."
 
@@ -9452,201 +9703,193 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "������� �� �����..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "������ � %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "�����"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "������ Viewer"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_������ � ��� ��������"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr ""
 "\n"
 "���������� ���������������: "
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "������� ����..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Email �����:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "�������-��:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1370
-#, fuzzy
-msgid "No GPG/PGP program configured."
-msgstr "���� �������� GPG/PGP ��������."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "������������ ��������� �� � ��������"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "���������� ���������"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "������� ����� ������� �� ������������."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9655,33 +9898,14 @@ msgstr ""
 "������ ��� '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "������� ���� ������"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "���������� ������ �� %s"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "���������� ������ �� %s"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9690,158 +9914,151 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "������ ����� ��������"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "��������� �� \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "��������� �� �����������"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "���������� ��������� - %s"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "����������."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "�������� ����������� � ���� �����"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "�������� �� �����������"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"�� ���� �� ������� ��������� �\n"
-"`%s'."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "��������"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "��������� �� ���� �����"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "����������� �� �����������"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� �� �����������"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ���� �� ������ �������: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "��������� ��� �������"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "��������� ��� �������"
@@ -9850,110 +10067,120 @@ msgstr "��������� ��� �������"
 msgid "_Search"
 msgstr "�������"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(����������)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "��������� �����������"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "���������� �����������"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "��������� �� �����������"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "��������"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Find:"
 msgstr "������"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "���:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "������������..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "��� ������:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "���:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "��������� � ����������� �� ����"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "����������"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 #, fuzzy
 msgid "Updating..."
 msgstr "���������� ..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "��������� ..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "����������."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 #, fuzzy
 msgid "User canceled operation."
 msgstr "������������� ����������"
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "���������� ������ �� %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "���������� ������ �� %s"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���������� ��������� - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "���������� ���������"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "�������� �� ����� %s"
@@ -9963,7 +10190,7 @@ msgstr "�������� �� ����� %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "��������� %s ����� �� %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9972,30 +10199,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "���������� VFolders"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "��� VFolder"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "����"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "���������"
@@ -10059,7 +10286,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "��������� �� �����������"
@@ -10086,26 +10313,26 @@ msgstr "��������� �� ����� � \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "�������� �� ����� %s"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10147,131 +10374,126 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "������ �������"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "������ �������"
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "���:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "���������"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "������ ��� ����������� �� %s"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "������ ��������"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "����"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "������:"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "�������"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "������������� ���������"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
@@ -10332,7 +10554,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10411,1079 +10633,1080 @@ msgstr "�������"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "������"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 #, fuzzy
 msgid "Rain"
 msgstr "�����"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "������ ������"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "Email"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "������ ������"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "������� Email"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "���������� �� ������"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "���������� ������"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 #, fuzzy
 msgid "Mist"
 msgstr "�-��"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "�������"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "������� ���� ��������"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "������ ��������"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "������� ���� ��������"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "�������"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "������"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "���"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "_���������"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "������ ������"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "�������"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "������ ������"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "������"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11493,8 +11716,9 @@ msgid " _Remove"
 msgstr "��������"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
-msgstr ""
+#, fuzzy
+msgid "Add n_ews feed"
+msgstr "������"
 
 #: my-evolution/my-evolution.glade.h:3
 #, fuzzy
@@ -11510,12 +11734,12 @@ msgstr "�����"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11559,16 +11783,13 @@ msgid "Show _today's tasks"
 msgstr "������ ��������"
 
 #: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Tasks "
-msgstr "������"
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-" ������: "
+msgid "Tasks "
+msgstr "������"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
@@ -11590,14 +11811,14 @@ msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_Five days"
 msgstr "�����"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_Mail"
@@ -11634,38 +11855,38 @@ msgstr "�������"
 msgid "Cancel Operation"
 msgstr "�������� �����"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "��������� �����"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "�� ���� �� ������ �������� ���������"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11676,7 +11897,7 @@ msgstr ""
 "%s\n"
 "������: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11685,7 +11906,7 @@ msgstr ""
 "�� ���� �� ������� ��������� �\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11693,7 +11914,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11702,7 +11923,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11710,6 +11931,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution - ������ ���� �����"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11725,27 +11959,27 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "������� � �����"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "�������� � �����"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11754,18 +11988,18 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "������"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11774,16 +12008,22 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "�������� �� ����� %s"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "��������� ��� �� ����� � ���������."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11793,54 +12033,29 @@ msgstr ""
 "�� ���� �� ������ ��������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "���� ������� ����������"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-"�� ���� �� ������ ���������� %s:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "��������� ��� �� ����� � ���������."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ������ ���� �����"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "���..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(����������)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11849,13 +12064,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11863,187 +12078,200 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "������� `%s' �� ����������."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "��:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "������"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: 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:209
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy �� ���� �� ���� ���������."
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "���� ������� ����������"
 
-#: shell/e-shell-view-menu.c:235
-msgid "Ximian Evolution"
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
 msgstr ""
+"�� ���� �� ������ ���������� %s:\n"
+"%s"
 
-#: 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."
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:165
+msgid "Bug buddy was not found in your $PATH."
+msgstr "Bug buddy �� ���� ������ � $PATH."
+
+#: shell/e-shell-view-menu.c:173
+msgid "Bug buddy could not be run."
+msgstr "Bug buddy �� ���� �� ���� ���������."
+
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "������� Evolution..."
+
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "����� � �����..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "������ ��� �������"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "������� �������"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
 
@@ -12051,46 +12279,36 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(���� ���)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12098,152 +12316,148 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "��� �� �����:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "�� ��������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "����� �����"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "��_���� �����"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_���� �����..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "�_������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "�_������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "_������ � ��� ��������"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "������������ ���:"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "������� ���� ������"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "��������"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12252,65 +12466,169 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(���� ���)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% ����������:"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "������/������� ������"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "���� ������"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "������ �� � �������"
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "������������� ����������"
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "������/������� ������"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "�����"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "��������"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "���� ������ ����� `%s'."
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "����������� ���� ��������"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "���������� ������"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12411,74 +12729,72 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 #, fuzzy
 msgid "Importers"
 msgstr "������"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 #, fuzzy
 msgid "Don't import"
 msgstr "�� ��������"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "�� �������� ���� ��������� ������."
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution Mail ������������"
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:236
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "������ ��� ����������� �� ����: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "������ ����"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "������ ������� ����..."
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "���� ������� ����������"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12577,7 +12893,7 @@ msgstr "�������� �����������"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "_Actions"
@@ -12604,7 +12920,7 @@ msgid "_Forward Contact..."
 msgstr "��������..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_�����..."
@@ -12655,7 +12971,7 @@ msgstr "���"
 msgid "Delete the appointment"
 msgstr "���� �����"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Go To"
 msgstr "����� �"
@@ -12795,11 +13111,12 @@ msgstr "�����..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "�������"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "������� � �������"
 
@@ -12816,7 +13133,7 @@ msgstr "������� ������� �� %s"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_����"
@@ -12838,7 +13155,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_�������"
 
@@ -12906,11 +13223,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "������� Evolution..."
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "����������"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13192,325 +13504,355 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "�������� �� ��������� �� �����������"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "������ ���� ���������"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "������ ���� ���������"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "������ ����� Mailing List"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "������ ����� ��������"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "������ ����� ����������"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "������ ����� ����"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward As"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "������ ������� ����..."
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "���������� ���������"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "�����"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "�������� ���� �����������"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "�������� ����������� � ���� �����"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "�������"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "��������� �����������"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "���������"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "����� ����������� ���������"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "������� �� ����������� �� �����"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "��������� �����������"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "��������� �����������"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "��������� �����������"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "��������� �����������"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "�������� �� ������"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "������� ����������� ����..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "������� ����������� � �������� �����"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "������ ������ ���������"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "���� ��������� � uid %s"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "�������� ���� ��� �����������"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "��������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "������ ����� Mailing List"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder ����� ��������"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder ����� ����������"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder ����� ����"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "������� � �����"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "������ ������� �� �����������"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "���������� ���������"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "�������"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "_���������"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "�������� � �����"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "�������"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "_���������"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "���_��������"
@@ -13521,7 +13863,7 @@ msgstr "������� ���� ��������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�������"
@@ -13553,11 +13895,12 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "�_�����"
+#, fuzzy
+msgid "For_mat"
+msgstr "������"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13607,7 +13950,7 @@ msgid "Save in folder..."
 msgstr "������� � �����..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "������� ������� ����"
 
@@ -13703,7 +14046,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Insert"
 msgstr "_������"
@@ -13721,7 +14064,7 @@ msgstr "�������-��:"
 msgid "_Security"
 msgstr "_���������"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_�����"
 
@@ -13980,10 +14323,6 @@ msgstr ""
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -14071,35 +14410,35 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 #, fuzzy
 msgid "_Current View"
 msgstr "�������� �����"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -14107,106 +14446,110 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "���������� �� ���������� ������ �� � ����� 0 � 100, �����������"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "�������"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "������������"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "���"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "���������� ������: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "�����"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "�������� �� ��������"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 #, fuzzy
 msgid "Save Search"
 msgstr "�������"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "������ � ���������"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "�������"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "������ ������"
 
@@ -14251,19 +14594,97 @@ msgstr "�������� �� ������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ���� �� ������������� GNOME-VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ���� �� ������������� GNOME"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
 #, fuzzy
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "������ ���������� ������� Evolution"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "������ �� %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "���������� ������"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "��������:"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail maildir-������ mail �������"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "�������������� �� �����"
+
+#, fuzzy
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "���� �������� GPG/PGP ��������."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "������������ ��������� �� � ��������"
+
+#~ msgid "Encrypted message"
+#~ msgstr "���������� ���������"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "������� ����� ������� �� ������������."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "�� ���� �� ������� ��������� �\n"
+#~ "`%s'."
+
+#, fuzzy
+#~ msgid "Units: "
+#~ msgstr ""
+#~ "\n"
+#~ " ������: "
+
+#~ msgid "F_ormat"
+#~ msgstr "�_�����"
+
+#, fuzzy
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "���� �������� NNTP ������ �� %s@%s"
 
@@ -14282,10 +14703,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "�� ���� �� ������ �������� mbox `%s': %s"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "���������� ����������"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr " ���� �������� �� �������"
 
@@ -14359,9 +14776,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "123"
 #~ msgstr "123"
 
-#~ msgid "Open calendar"
-#~ msgstr "������ ��������"
-
 #~ msgid "Save calendar"
 #~ msgstr "������� ��������"
 
diff --git a/po/ca.po b/po/ca.po
index 08d4eff251..77b1b434db 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -23,512 +32,517 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nom"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Primari"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Ocupat"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Copia"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organitzaci�"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Cotxe"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Fax de la feina"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ocupat"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "XDSI"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Altres"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Un altre 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Busca"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "R�dio"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "T�lex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Adre�a electr�nica 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "_Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Dilluns"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "_Sobrenom:"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Agenda"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "Ani_versari:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Nom complet:"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Pa�_s:"
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 #, fuzzy
 msgid ""
 "\n"
@@ -545,25 +559,25 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "P�blic"
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -572,39 +586,41 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "_Par�metres"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr ""
@@ -612,55 +628,55 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
@@ -711,50 +727,50 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 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:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Visualitza tots els contactes"
@@ -794,7 +810,7 @@ msgid "Base"
 msgstr "Enganxa"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
@@ -881,16 +897,16 @@ msgstr "cont�"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Afegeix"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Edita"
@@ -912,23 +928,29 @@ msgstr "Prioritat:"
 msgid "_Server name:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -936,54 +958,54 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -997,56 +1019,56 @@ msgstr "L'URI que mostrar� el navegador de carpetes"
 msgid "(none)"
 msgstr "(Sense nom)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "Fitxer de signatura:"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Categories disponibles:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -1059,53 +1081,62 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 #, fuzzy
 msgid "Remove All"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1171,12 +1202,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalls"
 
@@ -1245,9 +1276,9 @@ msgstr "_Contactes..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Suprimeix"
@@ -1319,41 +1350,51 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 #, fuzzy
 msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "�s"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2498,7 +2539,7 @@ msgid "contact-list-editor"
 msgstr "Contacta l'editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
@@ -2548,160 +2589,167 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segons"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 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:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
@@ -2709,7 +2757,7 @@ msgstr "Error en llegir el fitxer de correu: %s"
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2717,89 +2765,98 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Business Address"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Home Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 #, fuzzy
 msgid "Other Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2988,104 +3045,118 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Imprimeix el missatge..."
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Edita una cita"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 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/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 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"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
@@ -3098,49 +3169,30 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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: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: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:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, 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: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"
+msgid "Starting:"
+msgstr "_Par�metres"
 
-#: 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:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Encap�alaments:"
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 #, fuzzy
-msgid "Notification about your task"
-msgstr "Mostra informaci� referent a l'Evolution"
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: 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"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarmes"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3162,12 +3214,12 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3175,7 +3227,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3186,41 +3238,41 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "Could not create the alarm notify service"
+msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -3228,101 +3280,79 @@ msgstr "%A, %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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La data s'ha d'introduir amb el format: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3332,59 +3362,62 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: 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"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Cerca"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "Cotxe"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "Setmana de treball"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "Setmana"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "Mes"
@@ -3404,12 +3437,12 @@ msgstr "Descripci�:"
 msgid "Comment contains"
 msgstr "cont�"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3417,9 +3450,9 @@ msgstr "Agenda"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
@@ -3429,27 +3462,27 @@ msgstr "Tasques"
 msgid "Folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Tasca"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� l'agenda"
 
@@ -3527,52 +3560,52 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
@@ -3634,17 +3667,12 @@ msgstr "Crea una nova cita"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3667,7 +3695,7 @@ msgstr "Recordatoris"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -3700,7 +3728,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -3759,7 +3787,7 @@ msgid "First day of wee_k:"
 msgstr "primer dia de la setmana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Divendres"
 
@@ -3772,7 +3800,7 @@ msgid "Minutes"
 msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -3782,7 +3810,7 @@ msgid "O_verdue tasks:"
 msgstr "Elements ven�uts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -3807,7 +3835,7 @@ msgid "Su_n"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -3827,7 +3855,7 @@ msgid "Tas_ks due today:"
 msgstr "Elemts que vencen avui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -3850,12 +3878,12 @@ msgid "Time format:"
 msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Dimarts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -3939,128 +3967,133 @@ msgstr "dc."
 msgid "before the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "No s'han pogut actualitzar correctament els fitxers"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4068,73 +4101,73 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 #, 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 #, 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 #, 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4156,27 +4189,27 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel�lat"
@@ -4197,12 +4230,13 @@ msgid "Classification"
 msgstr "Classificaci�"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data d'enviament"
@@ -4213,12 +4247,12 @@ msgid "F_ree"
 msgstr "setmana"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "P�_blic"
 
@@ -4229,7 +4263,7 @@ msgid "Show Time As"
 msgstr "Mostra"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Resu_m:"
 
@@ -4242,35 +4276,19 @@ msgstr "Hora de _finalitzaci�:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "Persones _requerides"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Persones _requerides"
-
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Non-Participants"
-msgstr "Persones _requerides"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -4318,6 +4336,7 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4338,7 +4357,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -4356,8 +4375,8 @@ msgid "_Change Organizer"
 msgstr "Organitzaci�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4369,25 +4388,25 @@ msgstr "Organitzaci�:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
@@ -4458,19 +4477,15 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4490,7 +4505,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4503,149 +4518,180 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Descripci�:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Confidencial"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Suprimeix un contacte"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -4680,8 +4726,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
@@ -4696,342 +4742,424 @@ msgstr "Tasques"
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 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:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "% comp_let:"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Cap informaci�"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Error desconegut"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Fitxer de signatura:"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "ha estat despr�s de"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Descripci�:"
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "set"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Tentatiu"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, 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:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, 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:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, 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:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 #, 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:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5078,88 +5206,107 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:97
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Elimina una acci�"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "En proc�s"
@@ -5167,116 +5314,122 @@ 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:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Invita a altres..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: calendar/gui/e-tasks.c:355
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Obre l'agenda"
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -5347,239 +5500,282 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Tasca"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Estat:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritat:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Marca la tasca com a completa"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "categories"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Contactes..."
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuraci� de la p�gina:"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5587,126 +5783,126 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5735,7 +5931,7 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5743,7 +5939,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5751,99 +5947,99 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 #, 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:683
+#: camel/camel-filter-driver.c:686
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, 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:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "C�pia de missatges"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5852,7 +6048,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5861,7 +6057,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5870,192 +6066,192 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "No s'ha pogut bifurcar: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en %"
 "s. Torneu-ho a provar m�s tard."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, 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:194
+#: camel/camel-pgp-context.c:197
 #, 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:525
+#: camel/camel-pgp-context.c:561
 #, 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:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, 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:908
+#: camel/camel-pgp-context.c:956
 #, 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:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, 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:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, 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"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No s'ha pogut carregar %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -6077,7 +6273,7 @@ msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
@@ -6087,13 +6283,13 @@ msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -6210,7 +6406,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -6232,8 +6428,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -6263,55 +6459,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: 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:174
+#: 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:607
+#: camel/camel-service.c:611
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Prove�dor de correu de la carpeta virtual"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 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:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, 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:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6358,17 +6554,17 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6376,7 +6572,7 @@ msgid ""
 msgstr "Assumpte"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6386,7 +6582,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6398,39 +6594,39 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
@@ -6467,62 +6663,62 @@ msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c: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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 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:15
+#: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
@@ -6532,7 +6728,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -6569,30 +6765,30 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6603,95 +6799,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Carpetes virtuals"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, 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:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -6702,23 +6901,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "No s'ha pogut obrir el resum %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6727,21 +6931,21 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6750,15 +6954,15 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6767,19 +6971,19 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
@@ -6797,29 +7001,34 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Obre l'agenda"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6828,17 +7037,17 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6847,7 +7056,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6856,14 +7065,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6872,109 +7081,117 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no �s buida. No s'ha suprimit."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongru�ncia del resum, s'est� interrompent la sincronitzaci�"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "FIXME: Nou _missatge per contactar"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
@@ -6984,135 +7201,118 @@ msgstr "`%s' no �s un directori."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "S'est� sincronitzant \"%s\""
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "No s'ha pogut carregar %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "No s'ha trobat el missatge %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Not�cies d'USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Prove�dor per llegir i publicar als grups de not�cies d'USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "No s'ha pogut obrir el directori per al servidor de not�cies: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cies d'USENET mitjan�ant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7120,76 +7320,76 @@ msgstr ""
 "Aquesta opci� us autentica al servidor NNTP mitjan�ant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, 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:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, 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:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "Cos del missatge"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "No suprimeixis els missatges del servidor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -7197,7 +7397,7 @@ msgstr ""
 "Aquesta opci� us connectar� al sevidor POP mitjan�ant una contrasenya en "
 "text net. �s l'�nica suportada per molts servidors POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -7207,34 +7407,34 @@ msgstr ""
 "xifrada mitjan�ant el protocol APOP. Aix� no funcionar� per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
 "vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7243,12 +7443,12 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7256,7 +7456,7 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7265,22 +7465,22 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -7288,187 +7488,187 @@ msgstr ""
 "Per lliurar correu transferint-lo al programa \"sendmail\" en el sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 #, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7479,172 +7679,172 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -7676,21 +7876,21 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -7698,31 +7898,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ntrodu�u les adreces que rebran una c�pia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7735,7 +7935,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7744,73 +7944,73 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "S'est� movent"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7820,40 +8020,49 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7907,16 +8116,25 @@ msgstr "L'assumpte cont�"
 msgid "Subject does not contain"
 msgstr "L'assumpte no cont�"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -7976,32 +8194,32 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 #, fuzzy
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -8141,22 +8359,22 @@ msgstr "Aleshores"
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Introdu�u l'URI de la carpeta"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
@@ -8173,42 +8391,42 @@ msgstr ""
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "outgoing"
 msgstr "Agrupament"
@@ -8419,7 +8637,7 @@ msgstr "Respon a tots"
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Remitent"
 
@@ -8454,7 +8672,7 @@ msgstr "comen�a per"
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assumpte"
@@ -8467,16 +8685,16 @@ msgstr "ha estat despr�s de"
 msgid "was before"
 msgstr "ha estat abans de"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "M�bil"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Filtres d'edici�"
@@ -8486,106 +8704,101 @@ msgstr "Filtres d'edici�"
 msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "acaba amb"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Agenda del Gnome"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimeix"
@@ -8632,272 +8845,277 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 msgid "Mail configuration interface"
 msgstr "Configuraci� del correu"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Suprimeix"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segons"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Valors predeterminats"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8922,36 +9140,46 @@ msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
+msgid "Body contents"
+msgstr "El cos cont�"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
 msgid "Current store format:"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "_�ndex"
+
+#: mail/local-config.glade.h:4
 #, fuzzy
 msgid "Mailbox Format"
 msgstr "Format"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 #, fuzzy
 msgid "New store format:"
 msgstr "Tipus de font de not�cies:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 #, fuzzy
 msgid "maildir"
 msgstr "Adre�a electr�nica 2"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 #, fuzzy
 msgid "mh"
 msgstr "h"
@@ -8972,19 +9200,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:947
+#: mail/mail-account-gui.c:959
 #, 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:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8995,7 +9223,7 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -9013,23 +9241,23 @@ msgstr "Inhabilitat"
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -9037,36 +9265,36 @@ msgstr ""
 "suprimir aquest contacte?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_Par�metres"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9078,7 +9306,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9086,7 +9314,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9094,23 +9322,23 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -9118,64 +9346,64 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 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:617
+#: mail/mail-callbacks.c:599
 #, 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:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, 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:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9183,7 +9411,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -9192,34 +9420,34 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, 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:1713
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'est� movent"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9227,12 +9455,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9241,20 +9469,20 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9298,17 +9526,17 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "cont�"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9319,16 +9547,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
@@ -9349,34 +9577,34 @@ 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:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Accounts"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9391,29 +9619,25 @@ msgstr "Autenticaci�:"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Authentication Type: "
-msgstr "Autenticaci�:"
+msgid "Checking for New Mail"
+msgstr "Comprova si hi ha nou correu"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Redacta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -9426,385 +9650,408 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Display"
 msgstr "_Visualitzaci�"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Drafts folder:"
-msgstr "Creaci� d'una nova carpeta"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Edita..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 #, 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:61
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Sent messages folder:"
-msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
+msgid "Ser_ver requires authentication"
+msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server Type: "
+msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:80
-#, fuzzy
-msgid "Server requires _authentication"
-msgstr "Autenticaci�:"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Font"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Autenticaci�:"
+
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr "Comprova si hi ha nou correu"
 
 #: mail/mail-config.glade.h:95
+msgid "_Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
 #, fuzzy
-msgid "_Check for supported types"
-msgstr "Detecta els tipus suportats..."
+msgid "_Drafts folder:"
+msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Cada"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "newswindow1"
 msgstr "finestra1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "segons."
 
@@ -9853,167 +10100,158 @@ msgstr "No s'ha pogut crear el quadre de di�leg."
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-#, fuzzy
-msgid "No GPG/PGP program configured."
-msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#: mail/mail-format.c:1386
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Esborra la visualitzaci� del missatge"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
 
-#: mail/mail-format.c:1397
+#: mail/mail-format.c:1822
 #, fuzzy
-msgid "Encrypted message"
-msgstr "Edita el missatge"
-
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr ""
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -10022,29 +10260,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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, 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:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -10052,16 +10290,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -10070,7 +10308,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -10079,26 +10317,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, 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:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
@@ -10108,163 +10327,156 @@ msgstr "S'est� movent"
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'est� marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"No es poden copiar els fitxers a\n"
-"`%s'."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "S'est� copiant"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
@@ -10274,111 +10486,121 @@ msgstr "S'est� recollint el correu des de %s"
 msgid "_Search"
 msgstr "Cerca"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sense t�tol)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Mou el missatge"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "_Edita el missatge"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "Reenvia"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Find:"
 msgstr "Cerca"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "Cam�:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 #, fuzzy
 msgid "Updating..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -10388,7 +10610,7 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "Updating vfolders for uri: %s"
 msgstr "S'est� carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10397,30 +10619,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "_Missatge"
@@ -10490,7 +10712,7 @@ msgstr "%I:%M %p"
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -10518,28 +10740,28 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10588,137 +10810,131 @@ 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:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
+msgid "Cannot initialize Evolution's Summary component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nom:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "_Par�metres"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: 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:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Altres"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "Seccions:"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "R_esum"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -10780,7 +10996,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10861,1087 +11077,1092 @@ msgstr "Baixa"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 #, fuzzy
 msgid "Rain"
 msgstr "R�dio"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 #, fuzzy
 msgid "Heavy rain"
 msgstr "Abast de dies"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "ara"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 #, fuzzy
 msgid "Snow grain showers"
 msgstr "Mostra en aquest ordre"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "_Correu"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 #, fuzzy
 msgid "Light hail"
 msgstr "vuit�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Mostra 1 dia"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "Adre�a electr�nica principal"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Sendmail"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "Mostra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Error desconegut"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Hora d'_inici de la reuni�:"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 #, fuzzy
 msgid "Mist"
 msgstr "�s"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "Vertical"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Llista de correu %s"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Suprimeix aquesta cita"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "Puntuaci�"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Suprimeix aquesta cita"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr ""
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Mostra"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "_Envia"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Cap�alera"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 #, fuzzy
 msgid "Light haze"
 msgstr "vuit�"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "dies"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
-msgstr ""
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
+msgstr "vuit�"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Esborra la visualitzaci� del missatge"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
-msgstr ""
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
+msgstr "Abast de dies"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Mostra 1 dia"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Vertical"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
-msgstr ""
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
+msgstr "Llista de correu %s"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Sendmail"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "agost"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11952,7 +12173,7 @@ msgstr "Elimina"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Afegeix un servidor de not�cies"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11970,12 +12191,12 @@ msgstr "Carpetes"
 msgid "All news _feeds:"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -12020,14 +12241,14 @@ msgid "Show _today's tasks"
 msgstr "Mostra les _adjuncions"
 
 #: my-evolution/my-evolution.glade.h:18
+msgid "Show temperatures in:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Tasks "
 msgstr "Tasques"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "Weather settings"
@@ -12049,14 +12270,13 @@ msgid "_Displayed feeds:"
 msgstr "_Visualitzaci�"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_Five days"
-msgstr "Divendres"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "_Imperial"
-msgstr "abril"
+msgid "_Five days"
+msgstr "Divendres"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -12097,24 +12317,24 @@ msgstr "Detalls"
 msgid "Cancel Operation"
 msgstr "Cancel�lat"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -12122,17 +12342,17 @@ msgstr ""
 "Aquesta nova versi� de l'Evolution necessita instal�lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal�lar els fitxers, o a "
 "\"Cancel�la\" per sortir."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -12143,14 +12363,14 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "S'ha produ�t un error en llegir el fitxer."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -12161,7 +12381,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal�laci�\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -12170,7 +12390,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -12181,6 +12401,20 @@ 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-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -12197,27 +12431,27 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -12226,20 +12460,20 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Crea \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -12248,16 +12482,22 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "El nom de carpeta indicat no �s v�lid."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -12267,34 +12507,11 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "(Cap carpeta mostrada)"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "No s'ha pogut crear el directori %s: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "El nom de carpeta indicat no �s v�lid."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -12302,19 +12519,19 @@ 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:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -12323,13 +12540,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12337,200 +12554,207 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, 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:433
+#: shell/e-shell-importer.c:434
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
 msgstr ""
+"No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "(Cap carpeta mostrada)"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 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:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:235
-#, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:237
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: shell/e-shell-view-menu.c:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"L'Evolution �s un conjunt d'aplicacions de treball en grup\n"
-"per a correu, agenda i gesti� de contactes\n"
-"dins de l'entorn d'escriptori GNOME."
+msgid "About Ximian Evolution"
+msgstr "_Quant a l'Evolution..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Error en desar el fitxer: %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
+msgstr "S'est� movent"
+
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
@@ -12539,46 +12763,36 @@ msgstr "S'est� movent"
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12586,37 +12800,33 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12625,126 +12835,126 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Envia aquest missatge"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Nom de la regla: "
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Elimina"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12753,65 +12963,171 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "No es pot bifurcar %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "Error d'E/S"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "adjunci�"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Cap"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "No s'ha trobat el fitxer"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Detecta els tipus suportats..."
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Consulta cancel�lada per l'usuari."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Error d'E/S"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "S_urt"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Agenda"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "La carpeta `%s' no existeix."
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "S'ha rebut el missatge"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Error desconegut"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12916,99 +13232,73 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 #, fuzzy
 msgid "Importers"
 msgstr "S'est� movent"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 #, fuzzy
 msgid "Don't import"
 msgstr "No l'eliminis"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Envia aquest missatge"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Par�metres"
 
-#: shell/main.c:162
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hola! Gr�cies per prendre-us la mol�stia de baixar-vos aquesta versi�\n"
-"provisional del conjunt de programes de grup de treball Evolution.\n"
-"M�s o menys durant el darrer mes i mig ens hem concentrat en fer que\n"
-"l'Evolution es pugui utilitzar. Molts dels seus desenvolupadors ja estan\n"
-"utilitzant-lo per llegir sempre el seu correu, aix� que tamb� ho podeu fer\n"
-"(per� feu c�pies de seguretat per si un cas!).\n"
-"\n"
-"Per�, encara que hem solucionat molts problemes que afectaven a "
-"l'estabilitat\n"
-"de l'Evolution, aqu� teniu encara el desc�rrec. L'Evolution pot: deixar de\n"
-"funcionar, perdre el correu que no voleu perdre, negar-se a suprimir el "
-"correu\n"
-"que voleu suprimir, deixar processos en marxa per tot arreu, consumir el "
-"100%\n"
-"de la CPU, anar massa de pressa, blocar-se, enviar correu HTML a llistes de\n"
-"correu a l'atzar, i deixar-vos en rid�cul davant dels vostres amics i "
-"companys\n"
-"de feina. Utilitzeu-lo nom�s sota un control estricte.\n"
-"\n"
-"Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
-"ansiosament les vostres contribucions!\n"
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Gr�cies\n"
-"L'equip de l'Evolution\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Error en carregar el fitxer: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Obre un fitxer"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "FIXME: Insereix el fitxer..."
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "(Cap carpeta mostrada)"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -13115,7 +13405,7 @@ msgstr "Atura la c�rrega"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Accions"
@@ -13141,7 +13431,7 @@ msgid "_Forward Contact..."
 msgstr "_Contactes..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
@@ -13195,7 +13485,7 @@ msgstr "Dia"
 msgid "Delete the appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Go To"
 msgstr "V�s a"
@@ -13340,11 +13630,12 @@ msgstr "Imprimeix..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Desa"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Desa i tanca"
 
@@ -13361,7 +13652,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fitxer"
@@ -13385,7 +13676,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Desa"
 
@@ -13457,11 +13748,6 @@ msgstr "Seleccioneu una carpeta"
 msgid "Customise My Evolution"
 msgstr "Evolution - %s"
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "Cancel�lat"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13755,335 +14041,365 @@ msgstr "Carpetes virtuals"
 msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "l'hora actual"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward As"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "V�s endavant en el temps"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Seg�ent"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "Mou el missatge"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Respon"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Busca"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualitzaci�"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Eines"
@@ -14095,7 +14411,7 @@ msgstr "Suprimeix aquesta cita"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
@@ -14130,11 +14446,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -14187,7 +14505,7 @@ msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
@@ -14299,7 +14617,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Insert"
 msgstr "_�ndex"
@@ -14318,7 +14636,7 @@ msgstr "Respon"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -14591,11 +14909,6 @@ msgstr "Mostra la barra de _dreceres"
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Work Offline"
-msgstr "S'est� movent"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -14682,35 +14995,35 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Avui"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -14718,108 +15031,112 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+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"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "setmana"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Turkish"
 msgstr "Tasca"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "Opcions"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nou"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Error desconegut: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "Altres"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
@@ -14871,22 +15188,188 @@ msgstr "Afegeix una font"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "Mostra informaci� referent a l'Evolution"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Error desconegut"
+
+#, fuzzy
+#~ msgid "_Invite Others"
+#~ msgstr "_Invita a altres..."
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Descripci�:"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "S'est� sincronitzant \"%s\""
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#, fuzzy
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "No es pot bifurcar %s: %s"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Agenda del Gnome"
+
+#, fuzzy
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "No hi ha cap programa GPG/PGP disponible."
+
+#, fuzzy
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Esborra la visualitzaci� del missatge"
+
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Edita el missatge"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "No es poden copiar els fitxers a\n"
+#~ "`%s'."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "abril"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "L'Evolution �s un conjunt d'aplicacions de treball en grup\n"
+#~ "per a correu, agenda i gesti� de contactes\n"
+#~ "dins de l'entorn d'escriptori GNOME."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hola! Gr�cies per prendre-us la mol�stia de baixar-vos aquesta versi�\n"
+#~ "provisional del conjunt de programes de grup de treball Evolution.\n"
+#~ "M�s o menys durant el darrer mes i mig ens hem concentrat en fer que\n"
+#~ "l'Evolution es pugui utilitzar. Molts dels seus desenvolupadors ja estan\n"
+#~ "utilitzant-lo per llegir sempre el seu correu, aix� que tamb� ho podeu "
+#~ "fer\n"
+#~ "(per� feu c�pies de seguretat per si un cas!).\n"
+#~ "\n"
+#~ "Per�, encara que hem solucionat molts problemes que afectaven a "
+#~ "l'estabilitat\n"
+#~ "de l'Evolution, aqu� teniu encara el desc�rrec. L'Evolution pot: deixar "
+#~ "de\n"
+#~ "funcionar, perdre el correu que no voleu perdre, negar-se a suprimir el "
+#~ "correu\n"
+#~ "que voleu suprimir, deixar processos en marxa per tot arreu, consumir el "
+#~ "100%\n"
+#~ "de la CPU, anar massa de pressa, blocar-se, enviar correu HTML a llistes "
+#~ "de\n"
+#~ "correu a l'atzar, i deixar-vos en rid�cul davant dels vostres amics i "
+#~ "companys\n"
+#~ "de feina. Utilitzeu-lo nom�s sota un control estricte.\n"
+#~ "\n"
+#~ "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
+#~ "ansiosament les vostres contribucions!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Gr�cies\n"
+#~ "L'equip de l'Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
+#, fuzzy
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
@@ -14914,10 +15397,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Aix� segurament vol dir que el component %s ha petat."
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "Crea una nova cita"
 
@@ -15109,10 +15588,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "%a %d/%m/%Y"
 
 #, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
-#, fuzzy
 #~ msgid "Elm mail"
 #~ msgstr "Adre�a electr�nica 2"
 
@@ -15121,11 +15596,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Adre�a electr�nica principal"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Missatge reenviat - %s"
 
@@ -15247,13 +15717,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "Suprimeix"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "Cap"
-
-#~ msgid "Task"
-#~ msgstr "Tasca"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% comp_let:"
 
@@ -15413,9 +15876,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "_Contacte (FIXME)"
 
-#~ msgid "_Index"
-#~ msgstr "_�ndex"
-
 #, fuzzy
 #~ msgid "_Mail message"
 #~ msgstr "Missatge de _correu (FIXME)"
@@ -15466,9 +15926,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Find..."
 #~ msgstr "Cerca..."
 
-#~ msgid "Open calendar"
-#~ msgstr "Obre l'agenda"
-
 #~ msgid "Save calendar"
 #~ msgstr "Desa l'agenda"
 
@@ -15505,10 +15962,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Task"
 #~ msgstr "Edita la tasca"
 
-#, fuzzy
-#~ msgid "Percent complete"
-#~ msgstr "Marca la tasca com a completa"
-
 #~ msgid "Mark the task complete"
 #~ msgstr "Marca la tasca com a completa"
 
@@ -15537,19 +15990,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
 #, fuzzy
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#, fuzzy
 #~ msgid "Add to Calendar"
 #~ msgstr "Sobre l'agenda"
 
 #, fuzzy
-#~ msgid " Tentative "
-#~ msgstr "Tentatiu"
-
-#, fuzzy
 #~ msgid "Update Calendar"
 #~ msgstr "_Obre una agenda"
 
@@ -15578,10 +16022,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Visualitza la carpeta seleccionada"
 
 #, fuzzy
-#~ msgid "Inline attachment"
-#~ msgstr "adjunci�"
-
-#, fuzzy
 #~ msgid "Send as:"
 #~ msgstr "Envia \"%s\""
 
@@ -16695,9 +17135,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Outline:"
 #~ msgstr "Contorn:"
 
-#~ msgid "Headings:"
-#~ msgstr "Encap�alaments:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Dia ressaltat:"
 
diff --git a/po/da.po b/po/da.po
index b71ffc56ce..c458655dbd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2001-10-27 08:21-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-27 14:25+0200\n"
 "Last-Translator: Anna Jonna Armannsdottir <a@ingenioer.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -31,291 +31,296 @@ msgstr "Fabrik for import af VCard-filer til Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer til Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prim�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Pri"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Arb"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Datamaskine"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax p� arbejde"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Arb-fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax hjemme"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Arb 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1602
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Persons�ger"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1633
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1634
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Netside"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Afd"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Ktr"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Leder"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Kaldt"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "�gtef�lle"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "FBUrl"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Br.dag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "F�dselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -323,7 +328,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -331,7 +336,7 @@ msgstr ""
 "\n"
 "Pr�fiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -339,7 +344,7 @@ msgstr ""
 "\n"
 "Opgivet:     "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -347,7 +352,7 @@ msgstr ""
 "\n"
 "Yderligere: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -355,7 +360,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -363,7 +368,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -371,7 +376,7 @@ msgstr ""
 "\n"
 "F�dselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -379,7 +384,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -387,7 +392,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -395,7 +400,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -403,7 +408,7 @@ msgstr ""
 "\n"
 "Vej:     "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -411,7 +416,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -419,7 +424,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -427,7 +432,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -435,7 +440,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -443,7 +448,7 @@ msgstr ""
 "\n"
 "Leveringsetiket: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -451,7 +456,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -459,7 +464,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -467,7 +472,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -475,7 +480,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -483,7 +488,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -491,7 +496,7 @@ msgstr ""
 "\n"
 "Tidszone: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -499,7 +504,7 @@ msgstr ""
 "\n"
 "Geografisk lokation: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -507,7 +512,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -515,7 +520,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -523,7 +528,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -531,7 +536,7 @@ msgstr ""
 "\n"
 "Enhed:  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -539,7 +544,7 @@ msgstr ""
 "\n"
 "Enhed2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -547,7 +552,7 @@ msgstr ""
 "\n"
 "Enhed3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -555,7 +560,7 @@ msgstr ""
 "\n"
 "Enhed4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -563,7 +568,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -581,7 +586,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -589,7 +594,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -597,11 +602,11 @@ msgstr ""
 "\n"
 "Offentlig n�gle: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -610,18 +615,18 @@ msgstr "VCard 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:1518
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1423
-#: calendar/conduits/todo/todo-conduit.c:1125
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "S�ger..."
 
@@ -634,60 +639,60 @@ msgstr "Indl�ser..."
 msgid "Error in search expression."
 msgstr "Fejl i s�geudtryk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Kobler til LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Kunne ikke koble til IMAP-server."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Venter p� tilkobling til LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Tilf�jer kort p� LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "�ndrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Modtager s�geresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Starter s�gning igen."
 
-#: addressbook/conduit/address-conduit.c:285
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�ren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:298
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\n"
 
-#: addressbook/conduit/address-conduit.c:1075
-#: calendar/conduits/calendar/calendar-conduit.c:965
-#: calendar/conduits/todo/todo-conduit.c:690
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat server"
 
-#: addressbook/conduit/address-conduit.c:1076
-#: calendar/conduits/calendar/calendar-conduit.c:966
-#: calendar/conduits/todo/todo-conduit.c:691
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:1106
-#: addressbook/conduit/address-conduit.c:1109
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke l�se pilotens adresseapplikationsblok"
 
@@ -731,39 +736,39 @@ msgstr "Fabrik for adressebogens adressevisning"
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik for eksempelkontrol for adressebog"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:301
-#: calendar/gui/dialogs/comp-editor-util.c:357 shell/e-local-storage.c:172
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 #: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Mappe som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Ny _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Ny kontakt_liste"
 
@@ -796,7 +801,7 @@ msgid "Base"
 msgstr "Basis"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Grundl�ggende"
 
@@ -890,7 +895,7 @@ msgstr "_Tilf�j"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "R_ediger"
@@ -908,19 +913,19 @@ msgid "_Server name:"
 msgstr "_Servernavn:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:465
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -930,7 +935,7 @@ msgstr ""
 "at du har indtastet en ugyldig URI, eller at LDAP-serveren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -942,7 +947,7 @@ msgstr ""
 "m� du kompilere programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra l�nken nedenunder.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -950,42 +955,42 @@ msgstr ""
 "Kunne ikke �bne denne adressebog. Venligst tjek at stien\n"
 "eksisterer og at du har rettigheder til at tilg� den."
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Indtast adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:757
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:758
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Navn indeholder"
 
-#: addressbook/gui/component/addressbook.c:759
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-post indeholder"
 
-#: addressbook/gui/component/addressbook.c:760
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avanceret..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeudforskeren vil vise"
 
@@ -998,51 +1003,51 @@ msgstr "URIen som mappeudforskeren vil vise"
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "V�lg en handling"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opret en ny kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Tilf�j adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:883
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "K�rer foresp�rgsel i adressebog..."
 
-#: addressbook/gui/component/e-address-popup.c:959
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Redig�r kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:989
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Tilf�j i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1032
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Flet E-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Deaktiv�r foresp�rgsler"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiv�r foresp�rgsler (farligt!)"
 
@@ -1054,35 +1059,35 @@ msgstr "Evolution adressebog-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik for adressebogens gr�nseflade for navnevalg"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Send HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Redig�r kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Kontaktliste uden navn"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d ikke vist)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
@@ -1103,7 +1108,15 @@ msgstr ""
 "detaljeret beskrivelse af omst�ndighederne \n"
 "omkring fejlen. Tak."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "V�lg kontakter fra adressebogen"
 
@@ -1163,12 +1176,12 @@ msgstr "Samarbejde"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1238,8 +1251,8 @@ msgstr "_Kontakter..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:702 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1309,46 +1322,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Slet kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt h�rer til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2230
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finde widget for felt: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Redig�r alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:202
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2415,7 +2428,7 @@ msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -2464,12 +2477,12 @@ msgstr ""
 "Den nye e-post-adresse eller navnet for denne kontakt\n"
 "eksisterer allerede i denne mappe. Vil du tilf�je den alligevel?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Avanceret s�gning"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
 #: mail/mail-search.c:263
 msgid "Search"
 msgstr "S�gning"
@@ -2489,9 +2502,9 @@ msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
@@ -2502,18 +2515,18 @@ msgid "Open"
 msgstr "�bn"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2521,12 +2534,12 @@ msgid "Print"
 msgstr "Udskriv"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:282 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:17
@@ -2534,81 +2547,86 @@ msgstr "Udskriv konvolut"
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:476
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fejl ved �ndring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:971
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke underst�ttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1201
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:608 camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Vil du gemme �ndringene?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Fejl ved tilf�jelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Fejl ved tilf�jelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Fejl ved �ndring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -2616,84 +2634,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilf�je en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Arbejdstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Telefon for tilbageringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Arbejdsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Arbejdstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Anden telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Anden adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "og %d andre kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "og eet andet kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2879,58 +2897,63 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Udskriv konvolut"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "R_edig�r aftale"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "H�j"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1701
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/conduits/calendar/calendar-conduit.c:923
+#: calendar/conduits/calendar/calendar-conduit.c:935
 #: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalenderserveren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1050
-#: calendar/conduits/calendar/calendar-conduit.c:1053
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke l�se pilotens kalender-applikationsblok"
 
-#: calendar/conduits/todo/todo-conduit.c:752
-#: calendar/conduits/todo/todo-conduit.c:755
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
@@ -2987,23 +3010,23 @@ msgid "Factory for the alarm notification service"
 msgstr "Fabrik for alarm-tjenesten"
 
 # Konteksten er planl�gning af opgaver. Dette er tidspunktet for begyndelsen
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Begynder:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:219
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "Ugyldig tidsangivelse"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Evolution Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmer %s"
@@ -3025,11 +3048,11 @@ msgstr "Uds�t-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edig�r aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Ingen beskrivelse tilg�ngelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3041,7 +3064,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for p�mindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3057,114 +3080,115 @@ msgstr ""
 "        %s\n"
 "Er du sikker p� at du �nsker at k�re dette program?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalendervisning. Venligst tjek din ORBit og OAF "
 "konfiguration."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:410 shell/evolution-shell-component.c:993
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Optaget"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "I gang"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:316
-#: calendar/gui/e-meeting-model.c:339 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3175,54 +3199,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1193 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Genindtr�ffer"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:300
-#: calendar/gui/e-meeting-model.c:721
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nej"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2010 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "S�ger..."
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Arbejdsugevisning"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Ugevisning"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "M�nedsvisning"
 
@@ -3238,48 +3262,48 @@ msgstr "Beskrivelse indeholder"
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1076
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Ingen tr�ffere"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 #: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og h�ndelser"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:246 my-evolution/e-summary-tasks.c:262
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
 #: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3447
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:650
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Ny _opgave"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -3351,110 +3375,110 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dage"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d uger"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 uge"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Spil en lyd"
 
-#: calendar/gui/dialogs/alarm-page.c:378
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Vis en besked"
 
-#: calendar/gui/dialogs/alarm-page.c:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Send en besked"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "K�r et program"
 
-#: calendar/gui/dialogs/alarm-page.c:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udf�res"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s f�r aftalen starter"
 
-#: calendar/gui/dialogs/alarm-page.c:407
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s efter aftalen er startet"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved aftalens start"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s f�r aftalen slutter"
 
-#: calendar/gui/dialogs/alarm-page.c:424
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter aftalens slutning"
 
-#: calendar/gui/dialogs/alarm-page.c:429
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved aftalens slutning"
 
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udl�sertype"
@@ -3475,7 +3499,7 @@ msgstr "P�mindelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:692 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3558,7 +3582,7 @@ msgid "First day of wee_k:"
 msgstr "F�rste dag i u_gen:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3571,7 +3595,7 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Mandag"
 
@@ -3580,7 +3604,7 @@ msgid "O_verdue tasks:"
 msgstr "Overskredne opga_ver:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "L�rdag"
 
@@ -3601,7 +3625,7 @@ msgid "Su_n"
 msgstr "S�_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -3618,7 +3642,7 @@ msgid "Tas_ks due today:"
 msgstr "Op_gaver som skal afsluttes i dag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3639,12 +3663,12 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -3713,123 +3737,123 @@ msgstr "_Ons"
 msgid "before the start of the appointment"
 msgstr "f�r aftalen starter"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "M�destatus er �ndret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker p� at du vil aflyse og slette dette m�de?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker p� at du vil aflyse og slette denne opgave?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker p� at du vil aflyse og slette denne journalopf�ring?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Denne h�ndelse er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denne opgave er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Denne journalopf�ring er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har lavet �ndringer. Skal disse �ndringer forkastes og redigeringen "
 "lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke lavet �ndringer. Skal redigeringen lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Denne h�ndelse er �ndret."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denne opgave er �ndret."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Denne journalopf�ring er �ndret."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har lavet �ndringer. Skal disse �ndringer forkastes og redigeringen "
 "opdateres?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort �ndringer. Opdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:179 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:183 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Fuldf�rt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:185 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Fuldf�rt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:190 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (F�rdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "F�rdig "
 
-#: calendar/gui/dialogs/comp-editor.c:304
+#: calendar/gui/dialogs/comp-editor.c:303
 msgid "Could not update object!"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:672
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:677
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:680
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1047 mail/mail-callbacks.c:1845
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:1051 mail/mail-callbacks.c:1852
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3838,53 +3862,53 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1095 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1250
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker p� at du vil slette denne aftale uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker p� at du vil slette denne opgave uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker p� at du vil slette journalopf�ringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil slette denne journalopf�ring uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker p� at du vil slette %d aftaler?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker p� at du vil slette %d opgaver?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker p� at du vil slette %d journalopf�ringer?"
@@ -3901,25 +3925,25 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:186 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "P�mindelse"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Genindtr�ffelse"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "M�deplanl�gning"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "M�de"
 
@@ -3979,15 +4003,20 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "En organisator er p�kr�vet."
 
-#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Mindst en deltager er n�dvendig"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Denne person er allerede sat op til dette m�de!"
 
-#: calendar/gui/dialogs/meeting-page.c:697
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4027,7 +4056,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
@@ -4061,34 +4090,35 @@ msgid "_Change Organizer"
 msgstr "�n_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Invit�r andre"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Invit�r andre..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "Anden _organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale har genindtr�ffelser som ikke kan redigeres af Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:933
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:959 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1097
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "gentagelser"
 
@@ -4152,19 +4182,15 @@ msgstr "uge(r)"
 msgid "year(s)"
 msgstr "�r"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Vil du gemme �ndringene?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "M�deinformationen er �ndret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er �ndret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Journalopf�ringen er �ndret. Send en opdateret version?"
 
@@ -4183,7 +4209,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4195,13 +4221,13 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:230
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:701
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
@@ -4215,88 +4241,88 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "F�r_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
 #: calendar/gui/e-week-view.c:1822
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
 #: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
-#: calendar/gui/e-week-view.c:3322 mail/folder-browser.c:1444
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
 #: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_�bn"
 
 #: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3404 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:945 calendar/gui/e-day-view.c:3479
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-week-view.c:3406 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:947 calendar/gui/e-day-view.c:3454
-#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-week-view.c:3335 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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"
@@ -4318,8 +4344,8 @@ msgstr "_Mark�r opgaver som fuldf�rte"
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:6955
-#: calendar/gui/e-week-view.c:3816
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
@@ -4329,18 +4355,18 @@ msgid "Click to add a task"
 msgstr "Klik for at tilf�je en opgave"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m-%Y %H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4356,7 +4382,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Fuldf�rt"
 
@@ -4387,8 +4413,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:45 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4400,117 +4426,117 @@ msgstr "Opgavesortering"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3304
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3316
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3324
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "Sle_t denne aftale"
 
-#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "G�r denne h�ndelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _h�ndelse"
 
-#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3353
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle h�ndelser"
 
-#: calendar/gui/e-itip-control.c:480
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "M�de starter: <b>"
 
-#: calendar/gui/e-itip-control.c:485
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "Opgave starter: <b>"
 
-#: calendar/gui/e-itip-control.c:490
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Ledig/optaget-information starter: <b>"
 
-#: calendar/gui/e-itip-control.c:494
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Starter: <b>"
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "M�de slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Ledig/optaget-information starter: <b>"
 
-#: calendar/gui/e-itip-control.c:514
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:526
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "Opgave Fuldf�rt <b>"
 
-#: calendar/gui/e-itip-control.c:536
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "Opgave p�begyndes: <b>"
 
-#: calendar/gui/e-itip-control.c:573 calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
 msgid "iCalendar Information"
 msgstr "kalenderinformation"
 
 #. Title
-#: calendar/gui/e-itip-control.c:588
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "Kalenderfejl"
 
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4518,267 +4544,267 @@ msgstr ""
 "<br>Venligst tjek f�lgende information og v�lg s� en handling fra menuen "
 "nedenunder."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:733 calendar/gui/e-itip-control.c:749
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:778
-#: calendar/gui/e-itip-control.c:792 calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
 msgid "Choose an action:"
 msgstr "V�lg en handling"
 
-#: calendar/gui/e-itip-control.c:734
+#: calendar/gui/e-itip-control.c:779
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:735 calendar/gui/e-itip-control.c:754
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:780
-#: calendar/gui/e-itip-control.c:794 calendar/gui/e-itip-control.c:808
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:249
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:795
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:796
 msgid "Tentatively accept"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:797
 msgid "Decline"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:811
 msgid "Send Free/Busy Information"
 msgstr "Send Ledig/optaget-information"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:824
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:838
 msgid "Send Latest Information"
 msgstr "Send nyeste Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:807 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publiceret m�deinformation."
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "M�deinformation"
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedev�relse i et m�de."
 
-#: calendar/gui/e-itip-control.c:828
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "M�deforslag"
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �nsker at tilf�je information til et eksisterende m�de."
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "M�deopdatering"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �nsker at modtage seneste m�deinformation."
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Anmodning om m�deopdatering"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret p� en m�deforesp�rgsel."
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "M�desvar"
 
-#: calendar/gui/e-itip-control.c:847
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et m�de."
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "M�deaflysing"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:902
-#: calendar/gui/e-itip-control.c:937
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforst�elig besked."
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�debesked"
 
-#: calendar/gui/e-itip-control.c:872
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publiceret information om en opgave."
 
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udf�rer en opgave."
 
-#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �nsker at tilf�je information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:887
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �nsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret p� en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Svar p� opgave"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:922
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Ledig/optaget foresp�rgsel"
 
-#: calendar/gui/e-itip-control.c:932
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret p� en foresp�rgsel efter ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Ledig/optaget svar"
 
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/optaget-besked"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Beskeden ser ikke ud til at v�re rigtig udformet"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder foresp�rgsler som ikke er underst�ttet."
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen viselig kalender-opf�ringer"
 
-#: calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Ddeltagerstatus kunne ikke opdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Ddeltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Ddeltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres fordi opf�ringen ikke eksisterer l�ngere"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke fjerne opf�ringen fra din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Opf�ring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1307 calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Opf�ringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1507
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Kunne ikke finde nogen af dine identiteter i deltagerlisten!\n"
 
@@ -4819,216 +4845,211 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520 calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Form�nd"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Obligatoriske deltagere"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Valgfrie deltagere"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Ikke-deltagere"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Resurse"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
-#: calendar/gui/e-meeting-model.c:691
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:692
-#: calendar/gui/e-meeting-model.c:708
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
-#: calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Formand"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522 calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:707
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Beh�ver handling"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
-#: calendar/gui/e-meeting-model.c:735
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-model.c:736 calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
-#: calendar/gui/e-meeting-model.c:737
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "I gang"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-msgid "Chair Persons"
-msgstr "Form�nd"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "Obligatoriske deltagere"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "Valgfrie deltagere"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-msgstr "Ikke-deltagere"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 msgid "%A, %B %d, %Y"
 msgstr "%A den %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:477
-#: calendar/gui/e-meeting-time-sel.c:2054 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "_Invit�r andre..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Opdater fri/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autov�lg"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en resurse"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en resurse"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Tid for m�dets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�bner lager %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indl�se opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er n�dvendig for at indl�se `%s' er ikke underst�ttet"
 
-#: calendar/gui/e-week-view.c:3302 calendar/gui/e-week-view.c:3340
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/gnome-cal.c:1316
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1327
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for at �bne `%s' er ikke underst�ttet"
 
-#: calendar/gui/gnome-cal.c:1682
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
@@ -5089,204 +5110,204 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "En organisator skal opgives."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i h�ndelsen"
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke oprette fabrik for komponentredigering"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "S�n"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "L�r"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Valgt m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Valgt �r (%Y)"
 
@@ -5328,7 +5349,7 @@ msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:607
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
@@ -5341,16 +5362,18 @@ msgstr "Udskriv opf�ring"
 msgid "Print Setup"
 msgstr "Skriverops�tning"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control-factory.c:76
+#: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Kunne ikke oprette visningen. Venligst unders�g din ORBit og OAF konfiguration."
+msgstr ""
+"Kunne ikke oprette visningen. Venligst unders�g din ORBit og OAF "
+"konfiguration."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5358,7 +5381,7 @@ msgstr ""
 "Evolution har udf�rt automatisk migration af opgaverne fra din kalendermappe "
 "til den nye opgave-mappe."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5370,7 +5393,7 @@ msgstr ""
 "Nogen af opgaverne kunne ikke migreres, s� denne proces vil kunne fors�ges "
 "igen i fremtiden."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5379,7 +5402,7 @@ msgstr ""
 "Kunne ikke �bne '%s'; ingen opf�ringer fra kalendermappen vil blive flyttet "
 "til opgavemappen."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5388,84 +5411,84 @@ msgstr ""
 "Metoden som kr�ves for at indl�se `%s' er ikke underst�ttet; ingen "
 "opf�ringer fra kalendermappen vil blive migreret til opgavemappen."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "tid-nu forventer 0 argumenter"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time forventer 1 argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 til make-time skal v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day forventer 2 argumenter"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day forventer at argument 2 er et heltal"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 1 argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 1 argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range forventer at argument 2 er af type time_t"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5473,11 +5496,11 @@ msgstr ""
 "contains? forventer at argument 1 er en af \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer mindst 1 argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5485,19 +5508,19 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller �t, og kun "
 "�t, argument er den boolske v�rdi falsk (#f)"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 1 argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering af s�geudtrykket gav ikke en boolsk v�rdi"
 
@@ -5521,7 +5544,7 @@ msgstr "Kryptering er ikke underst�ttet af dette cipher"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke underst�ttet af dette cipher"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5532,7 +5555,7 @@ msgstr ""
 "Videre operationer p� denne server vil ikke kunne afspilles n�r\n"
 "du kobler til dette netv�rk igen."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5543,15 +5566,15 @@ msgstr ""
 "%s\n"
 "�ndringer i denne mappe vil ikke blive resynkroniseret."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med server"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
@@ -5577,26 +5600,26 @@ msgstr "Mislykkedes p� besked %d"
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under l�sning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under k�rsel af filter: %s: %s"
@@ -5606,26 +5629,26 @@ msgstr "Fejl under k�rsel af filter: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udf�relse af filters�gning: %s: %s"
 
-#: camel/camel-folder.c:472
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Uunderst�ttet operation: till�g besked: for %s"
 
-#: camel/camel-folder.c:1041
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Uunderst�ttet operation: s�g efter udtryk: efter %s"
 
-#: camel/camel-folder.c:1081
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderst�ttet operation: s�g efter uid'er: efter %s"
 
-#: camel/camel-folder.c:1263
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Flytter beskeder"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5634,7 +5657,7 @@ msgstr ""
 "Kan ikke tolke udtrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5643,110 +5666,110 @@ msgstr ""
 "Fejl under k�rsel af s�geudtrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) kr�ver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udf�rer foresp�rgsel p� ukendt header: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-indeholder, forventer streng"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikke bygge kanal for l�sehj�lper: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan ikke k�re fork for l�sehj�lper: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Kunne ikke l�se '%s': protokolfejl med l�sehj�lper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke l�se '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke oprette l�sefil for %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsafbrud under ventning p� l�sefil for %s. Pr�v igen senere."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Fejl under l�sning ved brug af fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fejl under l�sning ved brug af flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke tjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke �bne postfil %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke �bne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke oprette kanal: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke k�re fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet mislykkedes: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Ukendt fejl)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fejl under l�sning af postfil: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fejl under skriving af midlertidig fil: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fejl under kopiering midlertidig beskedsfil: %s"
@@ -5761,84 +5784,84 @@ msgstr "Indtast venligst din %s adgangsfrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Indtast venligst din %s adgangsfrase"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikke signere denne besked: ingen tekst at signere"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan ikke signere denne besked: ingen adgangskode opgivet"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke signere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan ikke signere denne besked: ingen tekst for \"clearsign\""
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan ikke verificere denne besked: ingen tekst at verificere"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke verificere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Kunne ikke verificere denne besked: kunne ikke oprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke kryptere denne besked: ingen tekst at kryptere"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke kryptere denne besked: ingen adgangskode opgivet"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke kryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke kryptere denne besked: ingen modtagere opgivet"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke dekryptere denne besked: ingen ciphertekst at dekryptere"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan ikke dekryptere denne besked: ingen adgangskode opgivet"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke dekryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Kunne ikke indl�se %s: Modulindl�sning er ikke underst�ttet p� dette system."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke indl�se %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke indl�se %s: Ingen initieringskode i modulet."
@@ -5858,7 +5881,7 @@ msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
@@ -5868,12 +5891,12 @@ msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -5986,7 +6009,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
@@ -6003,8 +6026,8 @@ msgid "Unknown authentication state."
 msgstr "Ukendt autenticeringstilstand."
 
 #: 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -6033,55 +6056,55 @@ msgstr "POP f�r SMTP autenticering via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering af regul�rt udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et v�rtsnavn"
 
-#: camel/camel-service.c:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-post-udbyder for virtuelle mapper"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "For l�sning af e-post som en foresp�rgsel p� et andet s�t med mapper"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilg�ngelig for protokol `%s'"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6127,15 +6150,15 @@ msgstr "Fejl under dekodning af besked."
 msgid "Failed to verify certificates."
 msgstr "Fejl under verificering af certifikater."
 
-#: camel/camel-store.c:219
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation p� dette lager"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation p� dette lager"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6145,7 +6168,7 @@ msgstr ""
 "Emne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6160,7 +6183,7 @@ msgstr ""
 "\n"
 "Vil du acceptere alligevel?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6179,37 +6202,37 @@ msgstr ""
 "Stat: %s\n"
 "Land: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:589
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked %s i %s"
 
-#: camel/camel-vee-folder.c:750
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen s�dan besked: %s"
 
-#: camel/camel-vee-store.c:252
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:287
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen s�dan mappe"
 
-#: camel/camel-vee-store.c:300
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:308
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
@@ -6242,52 +6265,52 @@ msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev �delagt og lavet igen p� serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "S�ger efter �ndrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilg�ngelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
-#: camel/providers/imap/camel-imap-folder.c:1766
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1691
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1983
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Kan ikke �bne cache-katalog: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
@@ -6300,7 +6323,7 @@ msgstr "Ser efter nye beskeder"
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mapper"
 
@@ -6334,28 +6357,28 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:520
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:530
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen underst�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:569
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:595
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6366,89 +6389,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:894
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1182
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring af lokal e-post i MH-lignende beskedskataloger."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lokale levering"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "For hentning af lokal e-post fra standard \"spools\" i mbox format"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Brug filtre for nye beskeder i INDBOKS"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "E-postmapper i \"Maildir\" format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring af lokal e-post i qmail maildir beskedsmapper."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standard Unix mbox \"spools\""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indboks"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -6459,27 +6484,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke gemme sammendrag: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilf�je besked i sammendraget: ukendt grund"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Besked aflyst"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilf�je besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6488,20 +6513,20 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Ingen s�dan besked"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6510,15 +6535,15 @@ msgstr ""
 "Kan ikke �bne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6527,19 +6552,19 @@ msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
@@ -6554,33 +6579,33 @@ msgstr "Kunne ikke s�ge i mappe `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke �bne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappel�s p�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Tilf�jelse af brev blev aflyst"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilf�je besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6589,17 +6614,17 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6608,7 +6633,7 @@ msgstr ""
 "Kunne ikke �bne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6617,14 +6642,14 @@ msgstr ""
 "Kunne ikke oprette fil '%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en normal fil."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6633,110 +6658,110 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke �bne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal fejl i l�sning af postboksen n�r position %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �bne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Tilf�jet brev er annulleret"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke et katalog."
@@ -6746,49 +6771,49 @@ msgstr "`%s' er ikke et katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke �bne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Kan ikke tilf�je besked i spool-filen: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke blive slettet"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6797,69 +6822,69 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan v�re beskadiget, kopi gemt i `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunne ikke gemme: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Indtast venligst NNTP-adgangskode for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Serveren godtog ikke brugernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Fejl under sending af brugernavn til server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Serveren godtog ikke brugernavn/adgangskode"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Besked %s ikke fundet."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra serveren."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kunne ikke indl�se gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET nyheder"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dette er en udbyder for l�sning af og postning af indl�g til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunne ikke �bne katalog for nyheds-server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6867,71 +6892,71 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-serveren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke �bne eller oprette .newsrc-fil for %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikke tjekke POP-server efter nye beskeder: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunne ikke hente besked: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente besked fra POP-server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Beskedslager"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Behold beskeder p� serveren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Slet efter %s dage"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For tilkobling til og nedhenting af e-post p� POP-servere."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6940,7 +6965,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativ som er underst�ttet af mange POP-"
 "servere."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6950,34 +6975,34 @@ msgstr ""
 "adgangskode via APOP-protokollen. Dette vil m�ske ikke virke for alle "
 "brugere selv p� servere som h�vder at underst�tte det."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lader dig koble til POP-serveren ved at bruge Kerberos 4 som "
 "autenticering."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autenticere mod KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunne ikke koble til server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-server p� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6986,12 +7011,12 @@ msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Ukendt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6999,7 +7024,7 @@ msgstr ""
 "Kunne ikke koble til POP-serveren.\n"
 "Ingen underst�ttelse for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7008,22 +7033,22 @@ msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Uventet svar fra POP-server: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -7031,172 +7056,172 @@ msgstr ""
 "For levering af e-post ved at videresende den til \"sendmail\"-programmet p� "
 "det lokale system."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke oprette kanal til sendmail: %s: besked ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke k�re fork p� sendmail: %s: besked ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende beskeden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail afsluttet med signal %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke k�re %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail afsluttet med status %d: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Kunne ikke finde 'Fra'-adresse i besked"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-postserver med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfejl i parametre eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar p� systemhj�lp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hj�lpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilg�ngelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Forespurgt e-post handling er ok, fuldf�rt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruger; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurgt e-post-handling er ikke udf�rt: postboks ikke tilg�ngelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurgt handling ikke udf�rt: postboks ikke tilg�ngelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurgt handling afbrudt: fejl i processering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruger; venligst pr�v <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurgt handling ikke udf�rt: utilstr�kkelig lagringsplads"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurgt e-post handling afbrudt: lagringsallokering overskredet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurgt handling ikke udf�rt: postboksnavn ikke tilladt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slut med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Adgangskodeoverf�ring kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kr�ves for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fejl ved Velkomst-svar: %s: muligvis ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7207,125 +7232,125 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsafbrud for HELO-foresp�rgsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fejl ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fejl ved \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fejl ved \"RCPT TO\"-svar: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fejl ved DATA-svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fejl ved DATA-svar: beskedsterminering: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsafbrud for QUIT-foresp�rgsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fejl ved QUIT-svar: %s: ikke-fatal"
@@ -7457,7 +7482,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Vedl�g en fil"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7466,29 +7491,29 @@ msgstr ""
 "Fejl under l�sning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indl�sning af fil: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7496,16 +7521,16 @@ msgstr ""
 "Kunne ikke �bne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7514,7 +7539,7 @@ msgstr ""
 "Kunne ikke s�ge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7523,7 +7548,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7532,7 +7557,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7540,7 +7565,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du pr�ve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7550,23 +7575,23 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Advarsel: �ndret besked"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inds�t fil"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7574,7 +7599,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udv�lgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7582,7 +7607,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7590,7 +7615,7 @@ msgstr ""
 "Kunne ikke oprette skrivevindue fordi du ikke har sat\n"
 "en identitet op i e-post-komponenten."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
@@ -7643,23 +7668,23 @@ msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
 #. Remember the password?
-#: e-util/e-passwords.c:348 mail/mail-session.c:258
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
-#: e-util/e-passwords.c:350 mail/mail-session.c:259
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk denne adgangskode for resten af denne session"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H:%M"
 
@@ -7710,30 +7735,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 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:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 msgid "%I:%M %p"
 msgstr "%H:%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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%H"
 
@@ -7869,7 +7894,7 @@ msgstr "S�"
 msgid "Add action"
 msgstr "Tilf�j handling"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7877,16 +7902,16 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Indtast URI for mappen"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<klik her for at v�lge en mappe>"
 
@@ -7903,39 +7928,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "udg�ende"
 
@@ -8128,7 +8153,7 @@ msgstr "Svaret til"
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Afsender"
 
@@ -8160,7 +8185,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
@@ -8173,15 +8198,15 @@ msgstr "var efter"
 msgid "was before"
 msgstr "var f�r"
 
-#: filter/rule-editor.c:161
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:257
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Tilf�j regel"
 
-#: filter/rule-editor.c:322
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -8189,42 +8214,42 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Pointregler"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du skal specificere mindst en mappe som kilde."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Venligst vent"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "S�ger i %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8232,19 +8257,15 @@ msgstr ""
 "Evolution har fundet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeKort:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressebog"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8252,23 +8273,23 @@ msgstr ""
 "Evolution har fundet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ger i katalog"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8276,11 +8297,11 @@ msgstr ""
 "Evolution har fundet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8288,7 +8309,7 @@ msgstr ""
 "Evolution har fundet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8324,40 +8345,40 @@ msgstr "Fabrik for e-post sammendrag komponent."
 msgid "Mail configuration interface"
 msgstr "Gr�nseflade for e-post-konfiguration"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Mappe for beskedslager (intern)"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Kunne ikke koble til lager: %s"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "�ndr denne mappes egenskaber"
 
-#: mail/component-factory.c:751
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8365,27 +8386,27 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at v�re beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Ny e-post _besked"
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 
-#: mail/component-factory.c:958
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1157
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
@@ -8398,164 +8419,164 @@ msgstr "Egenskaber for \"%s\""
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d valgte"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d sendte"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Lav vFolder fra s�gning"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VFolder for afse_nder"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VFolder for modtage_re"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VFolder p� e-post_liste"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtrer efter e-postliste"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VFolder p� e-postliste"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder p� e-postliste (%s)"
@@ -8658,7 +8679,7 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -8695,27 +8716,27 @@ msgstr "Er du sikker p� at du vil slette denne nyhedsgruppekonto?"
 msgid "Mail Settings"
 msgstr "Indstillinger for e-post"
 
-#: mail/mail-autofilter.c:69
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:212
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:228
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Tilf�j filterregel"
 
@@ -8814,20 +8835,20 @@ msgstr "en ukendt afsender"
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopier beskeder til"
 
-#: mail/mail-callbacks.c:1701
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d beskeder?"
 
-#: mail/mail-callbacks.c:1726
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8835,7 +8856,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:1765
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8843,28 +8864,28 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1779
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1901
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8876,11 +8897,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:2084
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Sp�rg mig ikke igen."
 
-#: mail/mail-callbacks.c:2192
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8889,19 +8910,19 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2204
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2267
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2313
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �bne alle %d beskeder i separate vinduer?"
@@ -8959,7 +8980,7 @@ msgstr ""
 "nedenunder. Dette navn bliver kun brugt for visning p� sk�rmen."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -9493,23 +9514,23 @@ msgstr "Skjul"
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1615
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "�bn l�nke i netl�ser"
 
-#: mail/mail-display.c:1617
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopier lokation for l�nke"
 
-#: mail/mail-display.c:1620
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Gem l�nke som"
 
-#: mail/mail-display.c:1623
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
@@ -9526,27 +9547,27 @@ msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc:"
 
@@ -9598,11 +9619,11 @@ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:701
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9611,27 +9632,27 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe p�: %s: %s"
 
-#: mail/mail-local.c:800
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1213
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1228
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan m�ske ikke konfigureres igen fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1250
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9639,16 +9660,16 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke �ndre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s igen"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9657,7 +9678,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9666,126 +9687,121 @@ msgstr ""
 "Fejl under udf�rsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:85
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Fuldf�rte alligevel sending af beskeden."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet p� besked %d af %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Fuldf�rt."
 
-#: mail/mail-ops.c:790
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:892
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Kan ikke kopiere en mappe '%s' over i sig selv."
-
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1062 shell/e-local-storage.c:178
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Affald"
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1310
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "T�mmer mappe"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1762
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9794,7 +9810,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9803,11 +9819,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9816,17 +9832,17 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2093
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
@@ -9932,17 +9948,17 @@ msgstr "Videresendt besked"
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ops�tter vmappe: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9955,20 +9971,20 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:686
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:799
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:853
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
@@ -10037,7 +10053,7 @@ msgstr "%a %H:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -10073,16 +10089,16 @@ msgstr "Abonnerer p� mappe \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Venligst v�lg en server."
 
@@ -10122,120 +10138,114 @@ msgstr "_Fjern abonnement"
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-komponent for sammendrag."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som indeholder Evolution sammendrag"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Aftaler"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Ingen aftaler"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l: %M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Tilf�j nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Navn:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Indstillinger for sammendrag"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
-#: my-evolution/e-summary-rdf.c:416
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Fejl under nedhentning af RDF"
 
-#: my-evolution/e-summary-rdf.c:529
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Nyhedstjenester"
 
-#: my-evolution/e-summary-tasks.c:247
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Ingen opgaver"
 
-#: my-evolution/e-summary-tasks.c:286
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Min vejrbesked"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Vejr-serveren kunne ikke kontaktes</b></dd>"
 
-#: my-evolution/e-summary-weather.c:560
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "Vejr"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:662
-msgid "KBOS:EGAA:RJTT"
-msgstr "KBOS:EGAA:RJTT"
-
-#: my-evolution/e-summary-weather.c:723
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regioner"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A %e. %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Udskriv sammendrag"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Fejl under udskrift af sammendrag"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
@@ -11870,7 +11880,7 @@ msgstr "Importer data og indstillinger fra andre programmer"
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11878,11 +11888,11 @@ msgstr ""
 "Venligst vent...\n"
 "S�ger efter eksisterende ops�tning"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -11895,7 +11905,7 @@ msgstr "V�lg mappe"
 msgid "Select a destination folder for importing this data"
 msgstr "V�lg en m�lmappe til at importere data"
 
-#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
@@ -11916,7 +11926,7 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte postassistent-gr�nsefladen for Evolution\n"
 
-#: shell/e-shell-startup-wizard.c:744
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11924,6 +11934,24 @@ msgstr ""
 "Venligst v�lg informationen\n"
 "du �nsker at importere"
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Intet filnavn specificeret."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Mappenavn kan ikke indeholde linjeskift."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Denne mappe kan ikke indeholde beskeder."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' og '..' er reserverede mappenavne."
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy blev ikke fundet i din $PATH."
@@ -11974,36 +12002,36 @@ msgstr "Ar_bejd frakoblet"
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:213
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1589
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klik p� denne knap for at arbejde frakoblet."
 
-#: shell/e-shell-view.c:1643
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i f�rd med at koble fra."
 
-#: shell/e-shell-view.c:1649
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klik p� denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:653
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
@@ -12231,63 +12259,63 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldf�rt)"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "En ikke-underst�ttet type"
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Et ikke underst�ttet skema"
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "En ikke-underst�ttet handling"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Tidligere ejer er d�d FIXME"
 
@@ -12424,19 +12452,19 @@ msgstr ""
 "Gennem denne assistent vil du ledes gennem import af\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Import�r ikke"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Sp�rg mig ikke igen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
@@ -12444,62 +12472,24 @@ msgstr "Evolution kan importere data fra f�lgende filer:"
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
-#: shell/main.c:193
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hej. Tak for at du har taget dig tid til at nedhente denne pr�veversion\n"
-"af Ximian Evolution gruppevarepakken.\n"
-"\n"
-"Ximian Evolution er ikke f�rdig. Det n�rmer sig, men dele af "
-"funktionaliteten\n"
-"mangler eller er ikke fuldf�rt.\n"
-"\n"
-"Hvis du finder fejl, s� rapport�r dem gerne til bugzilla.ximian.com.\n"
-"Dette produkt giver dig ingen garanti og er ikke ment for\n"
-"individer som har let til voldsomme vredesudbrud.\n"
-"\n"
-"Vi h�ber at du nyder resultaterne af vort h�rde arbejde, og vi venter i\n"
-"sp�nding p� at du tilbyder din hj�lp!\n"
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Tak\n"
-"Ximian Evolution udviklerene\n"
-
-#: shell/main.c:268
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilg� Ximian Evolution-skallen."
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:347
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Deaktiv�r splash"
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejls�gingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:390
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -12799,11 +12789,12 @@ msgstr "Udskriv..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Gem"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Gem og luk"
 
@@ -12819,7 +12810,7 @@ msgstr "Gem denne opf�ring p� disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fil"
@@ -12841,7 +12832,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gem"
 
@@ -13465,7 +13456,7 @@ msgstr "Luk dette vindue"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "L_uk"
@@ -13496,8 +13487,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypt�r denne besked med dit S/MIME krypteringscertifikat"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13548,7 +13540,7 @@ msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
@@ -13641,7 +13633,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inds�t"
 
@@ -13657,7 +13649,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -13977,114 +13969,114 @@ msgstr "Definer visninger"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "nu"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "I dag"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen skal skrives ind p� formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentv�rdien skal v�re mellem 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Central-europ�isk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Gr�sk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "UCS"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Vest-europ�isk"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Traditionel"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Ny"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukendt tegns�t: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Indtast tegns�t som skal bruges"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Tegnkodning"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Redigering af s�gning"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Gem s�gning"
 
@@ -14121,11 +14113,11 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "S�_g"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Find nu "
 
@@ -14139,30 +14131,77 @@ msgstr "Personlig adressebogs-server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebogs-server; fabrik"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunne ikke initiere GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "_Invite Others"
+#~ msgstr "_Invit�r andre"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeKort:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Kan ikke kopiere en mappe '%s' over i sig selv."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "KBOS:ZSAM:EGAA"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "KBOS:EGAA:RJTT"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hej. Tak for at du har taget dig tid til at nedhente denne pr�veversion\n"
+#~ "af Ximian Evolution gruppevarepakken.\n"
+#~ "\n"
+#~ "Ximian Evolution er ikke f�rdig. Det n�rmer sig, men dele af "
+#~ "funktionaliteten\n"
+#~ "mangler eller er ikke fuldf�rt.\n"
+#~ "\n"
+#~ "Hvis du finder fejl, s� rapport�r dem gerne til bugzilla.ximian.com.\n"
+#~ "Dette produkt giver dig ingen garanti og er ikke ment for\n"
+#~ "individer som har let til voldsomme vredesudbrud.\n"
+#~ "\n"
+#~ "Vi h�ber at du nyder resultaterne af vort h�rde arbejde, og vi venter i\n"
+#~ "sp�nding p� at du tilbyder din hj�lp!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Tak\n"
+#~ "Ximian Evolution udviklerene\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
 #~ msgid "_Confidential"
 #~ msgstr "_Konfidentiel"
 
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "Mappenavn kan ikke indeholde linjeskift."
-
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "Mappenavn kan ikke indeholde katalogseparator."
 
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' og '..' er reserverede mappenavne."
-
 #~ msgid "%s - Ximian Evolution %s"
 #~ msgstr "%s - Ximian Evolution %s"
 
diff --git a/po/de.po b/po/de.po
index be75ade329..389f7ee215 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-10-28 18:45+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-28 19:07+01:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -18,6 +18,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importiert VCard-Dateien in Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
@@ -26,291 +36,296 @@ msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
 msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prim�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Prim"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Gesch�ft"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "R�ckruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Fa."
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Gesch�ftliches Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Gesch�ftlich 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Gesch�ft 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Funk"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Abt"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "B�ro"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "B�ro"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzn."
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalender-URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Verf�gbarkeits-Adresse"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "VURL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "JTag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorien"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Familienname"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -318,7 +333,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -326,7 +341,7 @@ msgstr ""
 "\n"
 "  Pr�fix:     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -334,7 +349,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -342,7 +357,7 @@ msgstr ""
 "\n"
 "  Zus�tzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -350,7 +365,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -358,7 +373,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -366,7 +381,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -374,7 +389,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -382,7 +397,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -390,7 +405,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -398,7 +413,7 @@ msgstr ""
 "\n"
 "  Stra�e:     "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -406,7 +421,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -414,7 +429,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -422,7 +437,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -430,7 +445,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -438,7 +453,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -446,7 +461,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -454,7 +469,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -462,7 +477,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -470,7 +485,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -478,7 +493,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -486,7 +501,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -494,7 +509,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -502,7 +517,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -510,7 +525,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -518,7 +533,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -526,7 +541,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -534,7 +549,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -542,7 +557,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -550,7 +565,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -558,7 +573,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -576,7 +591,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -584,7 +599,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -592,11 +607,11 @@ msgstr ""
 "\n"
 "�ffentlicher Schl�ssel: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard f�r %s"
@@ -605,16 +620,18 @@ 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:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1074
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Suchen..."
 
@@ -627,60 +644,60 @@ msgstr "Laden..."
 msgid "Error in search expression."
 msgstr "Fehler im Suchausdruck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Verbindung zu LDAP-Server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Verbindung IMAP-Server konnte nicht aufgebaut werden."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Warten auf Verbindung zum LDAP-Server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzuf�gen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server �ndern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Suche wird neu gestartet."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:645
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:646
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -724,38 +741,39 @@ msgstr "Factory f�r das Adress-Popup des Adressbuchs"
 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:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Ordner mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Neuer _Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Neue Kontakt_liste"
 
@@ -788,7 +806,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Grundlegend"
 
@@ -803,7 +821,9 @@ msgstr "E-Mail-Adresse:"
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu legitimieren"
+msgstr ""
+"Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
+"legitimieren"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
@@ -883,7 +903,7 @@ msgstr "Hinzuf�gen"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -900,11 +920,21 @@ msgstr "_Port:"
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs konnte nicht initialisiert werden"
+
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht ge�ffnet werden"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +944,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:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -927,7 +957,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -935,42 +965,42 @@ msgstr ""
 "Dieses Adressbuch konnte nicht ge�ffnet werden. Bitte pr�fen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen d�rfen."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Passwort f�r %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Irgend ein Feld enth�lt"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Name enth�lt"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-Mail enth�lt"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -983,51 +1013,51 @@ msgstr "Die URI, die der Suchdienst anzeigen wird"
 msgid "(none)"
 msgstr "(keine)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Prim�re E-Mail"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Eine Aktion w�hlen"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Einen neuen Kontakt \"%s\" anlegen"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzuf�gen"
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzuf�gen"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einflie�en lassen"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gef�hrlich!)"
 
@@ -1039,35 +1069,35 @@ msgstr "Evolution Namenauswahlschnittstelle f�r das Adressbuch."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Kontaktliste bearbeiten"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Namenlose Kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nicht gezeigt)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
@@ -1088,7 +1118,15 @@ msgstr ""
 "Beschreibung der Umst�nde, unter denen dieser Fehler auftrat,\n"
 "an Jon Trowbridge <trow@ximian.com>. Danke."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch w�hlen"
 
@@ -1148,12 +1186,12 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Details"
 
@@ -1174,7 +1212,9 @@ msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
 "of that information here."
-msgstr "Falls diese Person Verf�gbarkeits- oder andere Kalenderinformationen im Internet ver�ffentlicht, geben Sie die Adresse dieser Informationen hier ein."
+msgstr ""
+"Falls diese Person Verf�gbarkeits- oder andere Kalenderinformationen im "
+"Internet ver�ffentlicht, geben Sie die Adresse dieser Informationen hier ein."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
@@ -1220,8 +1260,8 @@ msgstr "Kontakte..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1461 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1280,49 +1320,56 @@ msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
 #: 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 "Sind Sie sicher, dass Sie diesen Account l�schen wollen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Kontakt l�schen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt geh�rt in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget f�r ein Feld konnte nicht gefunden werden: '%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzuf�gen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-Mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2391,7 +2438,7 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
@@ -2441,13 +2488,13 @@ msgstr ""
 "Kontakts gibt es bereits in diesem Ordner. M�chten Sie ihn\n"
 "trotzdem hinzuf�gen?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Suchen"
 
@@ -2466,9 +2513,9 @@ msgstr "%d Karten"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/widgets/e-addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -2479,18 +2526,18 @@ msgid "Open"
 msgstr "�ffnen"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:764
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:765
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2498,94 +2545,99 @@ msgid "Print"
 msgstr "Drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:767
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:769 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fehler beim �ndern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1875
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterst�tzt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:483 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Wollen Sie die �nderungen speichern?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Fehler beim Hinzuf�gen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Fehler beim Hinzuf�gen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Fehler beim �ndern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 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:1307
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
 #. 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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 
@@ -2593,84 +2645,84 @@ msgstr ",123,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 #. 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Prim�res Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Gesch�ftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "R�ckruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Gesch�ftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Gesch�ftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "und %d andere Karten."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "und eine andere Karte."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2856,94 +2908,109 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Karte drucken"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Termin _bearbeiten"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:708
-#: calendar/conduits/todo/todo-conduit.c:711
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolutions Chefsesselansichts-Komponente f�r den Kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "iTip-/iMip-Betrachter f�r den Evolution-Kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution-Komponente f�r die Verwaltung des Kalenders."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory f�r die Kalenderzusammenfassungs-Komponente."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Factory f�r den Evolution-Maileditor."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory f�r die Kalender-iTip-Ansichts-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Factory f�r die beispielhafte Kalender-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik, um eine Komponenteneditor-Fabrik zu erzeugen"
 
@@ -2955,9 +3022,30 @@ 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:350
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm am %A, %d. %b %Y %H.%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Einstellungen"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indizieren:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Ung�ltiges Argument"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarme"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -2976,11 +3064,11 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:663
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Keine Beschreibung verf�gbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:723
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2993,7 +3081,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:774
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3010,118 +3098,115 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausf�hren wollen?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs konnte nicht initialisiert werden"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory f�r Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "�ffentlich"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:460
-#: calendar/gui/e-meeting-time-sel.c:405 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Besch�ftigt"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3132,54 +3217,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1448
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nein"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Suchen"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Werkwochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Monatsansicht"
 
@@ -3195,26 +3280,27 @@ msgstr "Beschreibung enth�lt"
 msgid "Comment contains"
 msgstr "Kommentar enth�lt"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Nicht passend"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
@@ -3222,7 +3308,7 @@ msgstr "Ordner mit To-Do-Eintr�gen"
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
@@ -3235,7 +3321,7 @@ msgstr "Eine neue Aufgabe anlegen"
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
@@ -3308,115 +3394,110 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:371
+#: 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:375
+#: 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:379
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: 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:389
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuf�hrende Aktion"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:418
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:426
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at an unknown time"
-msgstr "%s zu einer unbekannten Zeit"
-
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s f�r einen unbekannten Ausl�sertyp."
@@ -3437,7 +3518,7 @@ msgstr "Erinnerungen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -3520,7 +3601,7 @@ msgid "First day of wee_k:"
 msgstr "Erster Tag der _Woche:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Freitag"
 
@@ -3533,7 +3614,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Montag"
 
@@ -3542,7 +3623,7 @@ msgid "O_verdue tasks:"
 msgstr "_�berf�llige Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -3563,7 +3644,7 @@ msgid "Su_n"
 msgstr "S_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -3580,7 +3661,7 @@ msgid "Tas_ks due today:"
 msgstr "Heute f�llige _Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -3601,12 +3682,12 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -3675,124 +3756,129 @@ msgstr "_Mi"
 msgid "before the start of the appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 "Der Status der Besprechung hat sich ge�ndert. Aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Sind Sie sicher, dass Sie diese Besprechung absagen und l�schen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe stornieren und l�schen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen Journaleintrag stornieren und l�schen "
 "wollen?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gel�scht."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gel�scht."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Dieser Journaleintrag wurde gel�scht."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben �nderungen vorgenommen. Diese vergessen und den Editor "
 "schlie�en?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine �nderungen vorgenommen, den Editor schlie�en?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde ge�ndert."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde ge�ndert."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Dieser Journaleintrag wurde ge�ndert."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben �nderungen vorgenommen. Diese vergessen und den Editor "
 "aktualisieren?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " an "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (F�llig am "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Dateien konnte nicht korrekt aktualisiert werden"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3801,54 +3887,54 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "�berschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, 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?"
@@ -3865,25 +3951,25 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -3902,11 +3988,12 @@ msgid "Classification"
 msgstr "Klassifikation"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Datum & Zeit"
 
@@ -3915,22 +4002,22 @@ msgid "F_ree"
 msgstr "_Frei"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "�ffentlich"
 
 #: 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 "Zeit zeigen als"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
@@ -3942,15 +4029,20 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Ein Organisator wird ben�tigt."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Mindestens ein Teilnehmer wird ben�tigt."
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -3961,49 +4053,56 @@ msgstr "Anwesender"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Gemeinsamer Name"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegiert durch"
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegiert an"
+msgid "Delegated From"
+msgstr "Delegiert durch"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Sprache"
+msgid "Delegated To"
+msgstr "Delegiert an"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Mitglied"
+msgid "Language"
+msgstr "Sprache"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "UAwg"
+msgid "Member"
+msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
 
-#: 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 "Status"
 
-#: 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:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4018,36 +4117,37 @@ msgid "_Change Organizer"
 msgstr "Organisator _�ndern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "Andere _einladen"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "Andere einladen..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enth�lt Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -4111,23 +4211,19 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die �nderungen speichern?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Die Besprechungsinformationen haben sich ge�ndert. Eine aktualisierte "
 "Version verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Die Aufgabeninformationen haben sich ge�ndert. Eine aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 "Der Journaleintrag hat sich ge�ndert. Eine aktualisierte Version schicken?"
@@ -4147,7 +4243,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4159,144 +4255,153 @@ msgstr "_Priorit�t:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "Vertraulich"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "F�llig am:"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:936 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1440
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Ausgew�hlte Kontakte l�schen"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "�_ffnen"
 
-#: calendar/gui/e-calendar-table.c:940 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:942 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:944 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:949
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:951
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "Diese Aufgabe _l�schen"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "Aufgaen als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1216
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:131 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:134 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:139
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4311,154 +4416,459 @@ msgstr ""
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "F�llig am"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Enddatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geographische Lage"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorit�t"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "Diesen Termin _l�schen"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Ende der Besprechung:"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Kalender-Information"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalender"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "ein unbekannter Absender"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Eine Aktion w�hlen"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Datum"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Angenommen"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Vorl�ufig"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Abgelehnt"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Kalender-Information"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Optionale Information"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Besprechung"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Ende der Besprechung:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Besprechung"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Eine Aktion w�hlen"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "In Nachricht suchen"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Die letzten Aufgabeninformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "Information"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "war nach"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Die letzten Aufgabeninformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "Antworten"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Aktion abbrechen"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalendermitteilung"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "_Verf�gbarkeits-Adresse:"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "_Verf�gbarkeits-Adresse:"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Vorige Nachricht"
+
+#: calendar/gui/e-itip-control.c:1052
+#, 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:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ung�ltigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Anwesenheitsstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 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:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 "Keine Ihrer Identit�ten kann in der Anwesenheitsliste gefunden werden!\n"
@@ -4500,218 +4910,213 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Vorsitzende"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Ben�tigte Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Optionale Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Nicht-Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Raum"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:691
-#: calendar/gui/e-meeting-model.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521 calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Ben�tigter Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529 calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Erfordert Ma�nahme"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:735 calendar/gui/e-meeting-time-sel.c:404
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Vorl�ufig"
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
-#: calendar/gui/e-meeting-model.c:736
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/e-meeting-model.c:1348 calendar/gui/e-meeting-model.c:1461
-msgid "Chair Persons"
-msgstr "Vorsitzende"
-
-#: calendar/gui/e-meeting-model.c:1349 calendar/gui/e-meeting-model.c:1416
-#: calendar/gui/e-meeting-model.c:1463
-msgid "Required Participants"
-msgstr "Ben�tigte Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1465
-msgid "Optional Participants"
-msgstr "Optionale Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1467
-msgid "Non-Participants"
-msgstr "Nicht-Teilnehmer"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:1956
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:1984 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Au�er Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:423
-msgid "_Invite Others..."
-msgstr "Andere einladen..."
-
-#: calendar/gui/e-meeting-time-sel.c:443
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:460
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "Verf�gbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:540
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:583
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Ben�tigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:596
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Ben�tigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:619
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:638
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden ge�ffnet"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' ben�tigt wird, ist nicht unterst�tzt"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum �ffnen von `%s' ben�tigt wird, wird nicht unterst�tzt"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
@@ -4772,230 +5177,275 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Mindestens ein Teilnehmer wird ben�tigt."
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Angew�hlter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Angew�hlte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Angew�hlter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Angew�hltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "Aufgabe"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "Status:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorit�t:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Abgeschlossen am:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorien: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Kontakte:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
+"ORBit und OAF Einstellungen. "
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5003,7 +5453,7 @@ msgstr ""
 "Evolution hat die Aufgaben aus Ihrem Kalenderordner entnommen und sie "
 "automatisch in den neuen Aufgaben-Ordner migriert."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5015,7 +5465,7 @@ msgstr ""
 "Einige Aufgaben konnten nicht migriert werden, so dass sich dieser Vorgang "
 "vielleicht noch einmal wiederholen wird."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5024,7 +5474,7 @@ msgstr ""
 "`%s' konnte nicht ge�ffnet werden; es migrieren keine Eintr�ge aus dem "
 "Kalenderordner in den Aufgaben-Ordner."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5033,85 +5483,85 @@ msgstr ""
 "Die zum Laden von `%s' ben�tigte Methode ist nicht unterst�tzt; keine "
 "Objekte aus dem Kalenderordner werden in den Aufgaben-Ordner migriert werden."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
 "Argument"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day erwartet zwei Argumente"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin erwartet 1 Argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end erwartet 1 Argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5119,11 +5569,11 @@ msgstr ""
 "contains? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5131,19 +5581,19 @@ msgstr ""
 "has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
 "Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? erwartet 1 Argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
@@ -5167,7 +5617,7 @@ msgstr "Verschl�sseln wird von dieser Verschl�sselung nicht unterst�tzt"
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschl�sselung nicht unterst�tzt"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5178,7 +5628,7 @@ msgstr ""
 "Weitere Operationen auf diesem Server werden nicht wiedergegeben\n"
 "werden, wenn Sie die Netzwerkverbindung wiederherstellen."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5189,15 +5639,15 @@ msgstr ""
 "%s\n"
 "�nderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:285
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 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:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
@@ -5210,6 +5660,7 @@ msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
 #: camel/camel-filter-driver.c:686
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
@@ -5222,26 +5673,26 @@ msgstr "Fehlgeschlagen bei Nachricht %d"
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
@@ -5251,26 +5702,26 @@ msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterst�tzte Operation: Nachricht anh�ngen: f�r %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterst�tzte Operation: Suche nach Ausdruck: f�r %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterst�tzte Operation: nach UIDs suchen: f�r %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Machrichten werden verschoben"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5279,7 +5730,7 @@ msgstr ""
 "Suchausdruck kann nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5288,112 +5739,112 @@ msgstr ""
 "Fehler beim Ausf�hren eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgef�hrt: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ung�ltiger Typ in body-contains, Zeichenkette wurde erwartet"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Pipe zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Sperrhilfsprogramm kann nicht abgespalten werden: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' konnte nicht gesperrt werden"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lockdatei f�r %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Zeit�berschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
 "Versuchen Sie es sp�ter noch einmal."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Maildatei %s konnte nicht �berpr�ft werden: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht ge�ffnet werden: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Tempor�re Maildatei %s konnte nicht ge�ffnet werden: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mail konnte nicht in tempor�rer Datei %s gespeichert werden: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgef�hrt werden: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der tempor�ren Maildatei: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der tempor�ren Maildatei: %s"
@@ -5408,92 +5859,92 @@ msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nachricht kann nicht signiert werden: kein signierbarer Klartext"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Nachricht konnte nicht signiert werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nachricht kann nicht signiert werden: Pipe zu GPG/PGP konnte nicht gelegt "
 "werden: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nachricht kann nicht signiert werden: kein Klartext zum Klarsignieren"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nachricht kann nicht verifiziert werden: kein verifizierbarer Klartext"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Diese Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht "
 "angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht gelegt "
 "werden: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nachricht kann nicht verschl�sselt werden: kein signierbarer Klartext"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nachricht kann nicht verschl�sselt werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Diese Nachricht kann nicht verschl�sselt werden: Pipe zu GPG/PGP konnte "
 "nicht gelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nachricht kann nicht verschl�sselt werden: keine Empf�nger angegeben"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "Nachricht kann nicht entschl�sselt werden: kein entschl�sselbarer "
 "chiffrierter Text"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nachricht kann nicht entschl�sselt werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nachricht kann nicht entschl�sselt werden: Pipe zu GPG/PGP konnte nicht "
 "gelegt werden: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterst�tzt."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
@@ -5513,7 +5964,7 @@ msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
@@ -5523,12 +5974,12 @@ msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -5641,7 +6092,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -5658,8 +6109,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Passwort"
 
@@ -5688,55 +6139,55 @@ 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:158
+#: 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:166
+#: 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:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgel�st"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Aufl�sen eines Namens: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 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:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle f�r Protokoll `%s' verf�gbar"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5782,16 +6233,18 @@ msgstr "Nachricht konnte nicht dekodiert werden."
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Auf Ordner kann nicht zugegriffen werden: Ung�ltige Aktion auf diesem Speicher"
+msgstr ""
+"Auf Ordner kann nicht zugegriffen werden: Ung�ltige Aktion auf diesem "
+"Speicher"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner kann nicht angelegt werden: Ung�ltige Aktion auf diesem Speicher"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5801,7 +6254,7 @@ msgstr ""
 "Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5816,7 +6269,7 @@ msgstr ""
 "\n"
 "M�chten Sie trotzdem akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5835,37 +6288,37 @@ msgstr ""
 "Bundesland/-staat: %s\n"
 "Land: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Nachricht gibt es nicht: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -5898,52 +6351,52 @@ msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung f�r %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerst�rt und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Verzeichnis konnte nicht ge�ffnet werden: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
@@ -5956,7 +6409,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Ordner"
 
@@ -5990,29 +6443,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschl�sselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6023,88 +6476,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Zum Speichern lokaler Mail in MH-Mailverzeichnissen"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Zum Empfangen lokaler Mail aus Spools im Standard-mbox-Format."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Filter auf neue Nachrichten in INBOX anwenden"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Mailverzeichnisse im Maildir-Format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "Zum Speichern lokaler Mail in Maildir-Verzeichnissen."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standard-Unix-mbox-Spools"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 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:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner kann nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Posteingangsordner"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
@@ -6115,28 +6570,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugef�gt werden: Grund unbekannt"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Anh�ngen von Nachricht an Maildir abgebrochen"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nachricht kann nicht an maildir-Ordner angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6145,20 +6600,20 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ung�ltiger Inhalt der Nachricht"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6167,15 +6622,15 @@ msgstr ""
 "Ordner `%s' konnte nicht ge�ffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6184,19 +6639,19 @@ msgstr ""
 "Ordner `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ist kein maildir-Verzeichnis."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
@@ -6211,33 +6666,33 @@ msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht ge�ffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Anh�ngen von Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6246,17 +6701,17 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6265,7 +6720,7 @@ msgstr ""
 "Datei `%s' konnte nicht ge�ffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6274,14 +6729,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine regul�re Datei."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6290,111 +6745,111 @@ msgstr ""
 "Ordner `%s' konnte nicht gel�scht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gel�scht."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner kann nicht gepr�ft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tempor�res Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassungs- und Order-Pr�ffehler, sogar nach einer Synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf tempor�res Postfach: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben auf tempor�res Postfach %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Tempor�rer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Anh�ngen der Nachricht mit MH abgebrochen"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
@@ -6404,49 +6859,49 @@ msgstr "`%s' ist kein Verzeichnis."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner k�nnen nicht gel�scht werden"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Tempor�rer Ordner %s konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Spool-Ordner '%s' konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6455,68 +6910,68 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner k�nnte besch�digt sein, Kopie in '%s' gespeichert"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Datei konnte nicht werden: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Bitte geben Sie das NNTP-Passwort f�r %s@%s ein"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Server lehnte Benutzername ab"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Benutzername konnte nicht an Server gesendet werden"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Nachricht %s nicht gefunden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "grouplist-Datei f�r %s konnte nicht geladen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "grouplist-Datei f�r %s konnte nicht gespeichert werden: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dies ist eine Quelle zum Lesen von und zum Posten in USENET-Newsgroups."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Verzeichnis f�r Newsserver konnte nicht ge�ffnet werden: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News �ber %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6524,72 +6979,72 @@ msgstr ""
 "Diese Option f�hrt die Legitimation am NNTP-Server mit einem "
 "unverschl�sselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ".newsrc-Datei f�r %s konnte nicht ge�ffnet oder erstellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Gel�schte Nachrichten werden ausger�umt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nachricht konnte nicht abgeholt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Nachrichtenspeicherung"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Mail auf Server belassen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Zum Verbinden mit und Herunterladen von Mail von POP-Servern."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6597,7 +7052,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschl�sselten Passwort "
 "verbinden. Viele POP-Server unterst�tzen nur dies."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6607,34 +7062,34 @@ msgstr ""
 "�ber das APO-Protokoll verbinden. Dies funktioniert evtl. nicht f�r alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterst�tzen."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Verbindung zu Server konnte nicht hergestellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort f�r %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6643,12 +7098,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6656,7 +7111,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterst�tzung f�r den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6665,22 +7120,22 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Unerwartete Antwort von POP-Server: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6688,175 +7143,175 @@ msgstr ""
 "Zum Ausliefern von Mail durch �bergabe an das Programm \"sendmail\" auf dem "
 "lokalen System."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nachricht konnte nicht verschickt werden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail brach mit Signal %s ab: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s konnte nicht ausgef�hrt werden: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail gab Status %d zur�ck: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "'Von'-Adresse konnte nicht in Nachricht gefunden werden"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail �ber einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Dienst schlie�t �bertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verf�gbar, �bertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgef�hrt: Postfach nicht verf�gbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgef�hrt: Postfach nicht verf�gbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgef�hrt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgef�hrt: Speicherzuteilung �berschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgef�hrt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Ein Password�bergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "F�r den verlangten Legitimationsmechanismus ist Verschl�sselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Legitimation ben�tigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "SMTP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort f�r %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6867,129 +7322,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung �ber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht g�ltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP-Begr��ung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeit�berschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Ung�ltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeit�berschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zeit�berschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
@@ -7121,7 +7576,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7130,29 +7585,29 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, �berschreiben?"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7160,16 +7615,16 @@ msgstr ""
 "Der Entw�rfe-Ordner f�r diesen Zugang konnte nicht ge�ffnet werden.\n"
 "M�chten Sie den vorgegebenen Entw�rfe-Ordner verwenden?"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7178,7 +7633,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7187,7 +7642,7 @@ msgstr ""
 "Datei konnte nicht verk�rzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7196,7 +7651,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7205,7 +7660,7 @@ msgstr ""
 "entdeckt.\n"
 "M�chten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7215,23 +7670,23 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre �nderungen speichern?"
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Datei �ffnen"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Datei einf�gen"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7239,7 +7694,7 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adressw�hler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7247,7 +7702,7 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7256,11 +7711,11 @@ msgstr ""
 "in der Mailkomponente noch keine Identit�t konfiguriert\n"
 "haben."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7308,15 +7763,24 @@ msgstr "Betreff enth�lt"
 msgid "Subject does not contain"
 msgstr "Betreff enth�lt nicht"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Dieses Passwort speichern"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y / %H.%M"
 
@@ -7367,30 +7831,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7526,24 +7990,25 @@ msgstr "Dann"
 msgid "Add action"
 msgstr "Aktion hinzuf�gen"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Sie haben vergessen, einen Ordner zu w�hlen.\n"
-"Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern der Mail."
+"Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern "
+"der Mail."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
-#: mail/mail-account-gui.c:824
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu w�hlen>"
 
@@ -7560,39 +8025,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Aktionen ausf�hren"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Kriterium hinzuf�gen"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "Ausgang"
 
@@ -7785,7 +8250,7 @@ msgstr "Beantwortet an"
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Absender"
 
@@ -7817,7 +8282,7 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
@@ -7830,15 +8295,15 @@ msgstr "war nach"
 msgid "was before"
 msgstr "war vor"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regeln"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Regel hinzuf�gen"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
@@ -7846,42 +8311,42 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie m�ssen mindestens einen Ordner als Quelle angeben."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importieren..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:93
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Mail"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7889,19 +8354,15 @@ msgstr ""
 "Evolution hat Elm-Maildateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7909,23 +8370,23 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7933,11 +8394,11 @@ msgstr ""
 "Evolution hat Netscape-Maildateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importiert Ihre alten Pine-Daten"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7945,7 +8406,7 @@ msgstr ""
 "Evolution hat Pine-Maildateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -7981,240 +8442,249 @@ msgstr "Factory f�r die Mailzusammenfassungs-Komponente."
 msgid "Mail configuration interface"
 msgstr "Mailkonfigurations-Oberfl�che"
 
-#: mail/component-factory.c:93
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mail enthaltender Ordner"
 
-#: mail/component-factory.c:94
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Mailspeicher-Ordner (intern)"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtueller M�ll"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtueller M�llordner"
 
-#: mail/component-factory.c:122
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
 
-#: mail/component-factory.c:140
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
-#: mail/component-factory.c:726
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
-msgstr "Einige Ihrer Mail-Einstellungen scheinen ung�ltig, bitte stellen Sie sicher, dass alles in Ordnung ist."
+msgstr ""
+"Einige Ihrer Mail-Einstellungen scheinen ung�ltig, bitte stellen Sie sicher, "
+"dass alles in Ordnung ist."
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Neue _Mail-Nachricht"
 
-#: mail/component-factory.c:910
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1090
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:270
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:287 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/folder-browser.c:762 mail/folder-browser.c:767
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d ausgew�hlt"
 
-#: mail/folder-browser.c:791
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/folder-browser.c:793
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d verschickt"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1042
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "vOrdner aus Suche erzeugen"
 
-#: mail/folder-browser.c:1423
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1424
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Absender"
 
-#: mail/folder-browser.c:1425
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber Empf�nger"
 
-#: mail/folder-browser.c:1426
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1441 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1442 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1447 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1460
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "L�schen r�ckg�ngig"
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzuf�gen"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1621
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filter �ber Mailingliste"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VOrdner �ber Mailingliste"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter �ber Mailingliste (%s)"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner �ber Mailingliste (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Vorgabe"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Ordner-Informationen werden entnommen"
@@ -8292,15 +8762,15 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:949
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: mail/mail-account-gui.c:1026
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:1032
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8310,7 +8780,7 @@ msgstr ""
 "\n"
 "M�chten Sie Ihre �nderungen speichern?"
 
-#: mail/mail-account-gui.c:1617
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Sie k�nnen keine zwei Zug�nge mit demselben Namen anlegen."
 
@@ -8326,52 +8796,52 @@ msgstr "Deaktivieren"
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie diesen Account l�schen wollen?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nicht l�schen"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Mail-Einstellungen"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail an %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzuf�gen"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8383,7 +8853,7 @@ msgstr ""
 "empfangen oder erstellen k�nnen.\n"
 "M�chten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8391,7 +8861,7 @@ msgstr ""
 "Sie m�ssen eine Identit�t einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8399,12 +8869,12 @@ msgstr ""
 "Sie m�ssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8412,11 +8882,11 @@ msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empf�nger wollen keine HTML-formatierte Mail:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8424,7 +8894,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8433,11 +8903,11 @@ msgstr ""
 "der Liste zu verbergen, wird die Nachricht nur BCC-Empf�ngeradressen "
 "enthalten."
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8447,41 +8917,41 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzuf�gt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Diese Nachricht enth�lt ung�ltige Empf�nger:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 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:600
+#: mail/mail-callbacks.c:599
 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:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 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:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, 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:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8489,7 +8959,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8497,29 +8967,29 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, 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:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8532,11 +9002,11 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8545,19 +9015,19 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8619,10 +9089,15 @@ msgstr ""
 "Dieser Name wird nur f�r die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Zugang"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8634,6 +9109,14 @@ msgstr ""
 "%s\n"
 "Es wird keine Verkn�pfung angelegt."
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Inbox"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
@@ -8656,7 +9139,8 @@ msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
 
 #: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "Beim Verschicken verschl�sselter Mail _immer vor mir selber verschl�sseln"
+msgstr ""
+"Beim Verschicken verschl�sselter Mail _immer vor mir selber verschl�sseln"
 
 #: mail/mail-config.glade.h:5
 msgid "Account"
@@ -8676,7 +9160,8 @@ msgstr "Zug�nge"
 
 #: mail/mail-config.glade.h:9
 msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Beim Verschicken verschl�sselter Mail immer vor mir selber _verschl�sseln"
+msgstr ""
+"Beim Verschicken verschl�sselter Mail immer vor mir selber _verschl�sseln"
 
 #: mail/mail-config.glade.h:10
 msgid "Always _sign outgoing messages when using this account"
@@ -8748,7 +9233,7 @@ msgstr "Anzeige"
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Entw�rfe"
 
@@ -8756,8 +9241,8 @@ msgstr "Entw�rfe"
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -8831,7 +9316,9 @@ msgstr "Pretty Good Privacy"
 
 #: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, nachfragen"
+msgstr ""
+"Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
+"nachfragen"
 
 #: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
@@ -8895,6 +9382,7 @@ msgid "Sending Mail"
 msgstr "Verschicken von Mail"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Verschickt"
 
@@ -9142,23 +9630,23 @@ msgstr "Verbergen"
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1611
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -9176,30 +9664,47 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9229,11 +9734,11 @@ msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9242,42 +9747,42 @@ msgstr ""
 "Metainformationen zum Ordner k�nnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr �ffnen k�nnen: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner k�nnen nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s k�nnen nicht gel�scht werden: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 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:1262
+#: mail/mail-local.c:1407
 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:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9286,7 +9791,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9295,7 +9800,7 @@ msgstr ""
 "Fehler beim Ausf�hren eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -9307,48 +9812,43 @@ msgstr "Ordner wird gefiltert"
 msgid "Fetching Mail"
 msgstr "Abrufen von Mail"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Trotzdem wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Ordner `%s' kann nicht in sich selbst kopiert werden."
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Verschiebe"
@@ -9362,6 +9862,12 @@ msgstr "Kopiere"
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "T�rkisch"
+
 #: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
@@ -9459,74 +9965,74 @@ msgstr "Verbindung mit %s wird neu aufgebaut"
 msgid "_Search"
 msgstr "_Suchen"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Unbenannte Nachricht"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Leere Nachricht"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Gro�-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Vorw�rts suchen"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Passt auf:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Alles abbrechen"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -9534,15 +10040,6 @@ msgstr "Storniert"
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr "Dieses Passwort speichern"
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9552,12 +10049,12 @@ msgstr "Passwort f�r %s eingeben"
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -9565,17 +10062,17 @@ msgstr "Weitergeleitete Nachricht"
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert f�r URI: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9588,24 +10085,30 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "Ordner"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
+msgstr ""
+"Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Nachricht"
@@ -9666,7 +10169,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -9702,16 +10205,16 @@ msgstr "Ordner \"%s\" wird abonniert"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gew�hlt"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Bitte w�hlen Sie einen Server."
 
@@ -9751,88 +10254,91 @@ msgstr "Ab_bestellen"
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente f�r die Chefsesselansicht"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Ordner mit der Evolution-�bersicht"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "EDDI:EDDH:EDDK:EDDM"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 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:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Name:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Einstellungen der Zusammenfassung"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Fehler beim Herunterladen des RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(keine Beschreibung)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 "<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
@@ -9842,31 +10348,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Wetter"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "EDDI:EDDH:EDDK:EDDM"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regionen"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Drucken der �bersicht fehlgeschlagen"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
@@ -11177,11 +11675,25 @@ msgstr "Details anzeigen"
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-setup.c:125
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "Besondere Ordner"
+
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11189,17 +11701,17 @@ msgstr ""
 "Diese neue Version von Evolution muss zus�tzliche Dateien in Ihr\n"
 "pers�nliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
 "zum Beenden."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11211,7 +11723,7 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11220,7 +11732,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11231,7 +11743,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11246,7 +11758,7 @@ msgstr ""
 "M�chten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11258,6 +11770,19 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ordner kann nicht in sich selbst verschoben werden."
@@ -11309,7 +11834,7 @@ msgstr "\"%s\" l�schen"
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#: shell/e-shell-folder-commands.c:456
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11318,15 +11843,21 @@ msgstr ""
 "Ordner kann nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner \"%s\" umbenennen in:"
 
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Der angegebene Ordnername ist nicht g�ltig: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11336,32 +11867,11 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Kein Ordnername angegeben."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Ordner darf das Verzeichnistrennzeichen nicht enthalten."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' und '..' sind reservierte Ordnernamen."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Der angegebene Ordnername ist nicht g�ltig: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11369,19 +11879,19 @@ 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:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "W�hlen Sie den Importeur, der ausgef�hrt werden soll"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11395,13 +11905,13 @@ 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
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Bitte w�hlen Sie die Informationen, die Sie importieren wollen"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11412,7 +11922,7 @@ msgstr ""
 "Importeur nicht bereit.\n"
 "Es wird 5 Sekunden bis zum n�chsten Versuch gewartet"
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11421,16 +11931,16 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Sie k�nnen nur in lokale Ordner importieren"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11440,11 +11950,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11453,17 +11963,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11472,31 +11982,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus �lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11504,41 +12014,48 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 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:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d)Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "(%s:%d)Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11546,11 +12063,28 @@ msgstr ""
 "Bitte w�hlen Sie die Informationen,\n"
 "die Sie importieren wollen"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Kein Ordnername angegeben."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' und '..' sind reservierte Ordnernamen."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
@@ -11576,7 +12110,9 @@ msgstr "W�hlen Sie den Ordner, auf den die Verkn�pfung zeigen soll:"
 
 #: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu sein."
+msgstr ""
+"Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
+"sein."
 
 #: shell/e-shell-view-menu.c:570
 #, c-format
@@ -11584,11 +12120,15 @@ msgid "Error executing %s."
 msgstr "Fehler beim Ausf�hren von %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Offline _arbeiten"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -11596,49 +12136,39 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 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:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 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:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1642
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11649,35 +12179,31 @@ msgstr ""
 "unerwartet ab. Sie m�ssen Evolution beenden und neu starten, um\n"
 "wieder auf diese Daten zugreifen zu k�nnen."
 
-#: shell/e-shell.c:1865 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1867
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:1869
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:1871
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1873 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Neue Verkn�pfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11686,116 +12212,112 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der Verkn�pfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verkn�pfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Gro�e Icons"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verkn�pfungen als gro�e Icons zeigen"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verkn�pfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verkn�pfung verbundenen Ordner �ffnen"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster �ffnen"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Den mit dieser Verkn�pfung verbundenen Ordner in einem neuen Fenster �ffnen"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Diese Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verkn�pfung aus der Verkn�pfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verkn�pfungen."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Verkn�pfungen"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11804,132 +12326,133 @@ msgstr ""
 "Ordner kann nicht �bertragen werden:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 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:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Ung�ltiges Argument"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Nicht unterst�tzter Typ"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Nicht unterst�tztes Schema"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Nicht unterst�tzte Aktion"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ung�ltiger URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -11940,7 +12463,7 @@ msgstr ""
 "\n"
 "Unbekannter Fehler."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -11953,7 +12476,7 @@ msgstr ""
 "Der Fehler im Komponentensystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12065,84 +12588,68 @@ msgstr ""
 "Dieser Druide f�hrt Sie durch das Importieren externer\n"
 "Dateien in Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Nicht importieren"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hallo. Viele Dank daf�r, dass Sie sich die Zeit genommen haben, diese\n"
-"Vorschauversion der Groupware-Suite Ximian Evolution herunterzuladen.\n"
-"\n"
-"Ximian Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
-"Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
-"\n"
-"Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian.com.\n"
-"Auf dieses Produkt gibt es keinerlei Garantie und es ist nicht f�r\n"
-"Individuen bestimmt, die zu gewaltt�tigen Wutanf�llen neigen.\n"
-"\n"
-"Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
-"werden, und wir hoffen auf Ihre Mitarbeit!\n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Danke.\n"
-"das Ximian-Evolution-Team\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell kann nicht initialisiert werden: %s"
 
-#: shell/main.c:344
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:387
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Fehler beim Laden der Datei: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Datei �ffnen"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Datei einf�gen"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Kein Ordnername angegeben."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12422,11 +12929,12 @@ msgstr "Drucken..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Speichern"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Speichern und schlie�en"
 
@@ -12442,7 +12950,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datei"
@@ -12464,7 +12972,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -12524,10 +13032,6 @@ msgstr "Eine Besprechung f�r diesen Eintrag ansetzen"
 msgid "Customise My Evolution"
 msgstr "My Evolution anpassen"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Den aktuellen Mailvorgang abbrechen"
@@ -13097,7 +13601,7 @@ msgstr "Dieses Fenster schlie�en"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Schlie�en"
@@ -13129,7 +13633,8 @@ msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschl�sselungszertifikat verschl�sseln"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -13181,7 +13686,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -13274,7 +13779,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Einf�gen"
 
@@ -13290,7 +13795,7 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -13526,10 +14031,6 @@ msgstr "_Verkn�pfung"
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Offline _arbeiten"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Die Eigenschaften f�r die �bersicht �ndern"
@@ -13604,136 +14105,136 @@ msgstr ""
 "heranzuzoomen, und w�hlen Sie eine Zeitzone.\n"
 " Mit der rechten Maustaste k�nnen Sie wegzoomen."
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Heute"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlie�lich) sein"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Mitteleurop�isch"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Griechisch"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "T�rkisch"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Westeurop�isch"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Vereinfach"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Neu"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz an"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Anderer..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor f�r Suchen"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Zu gespeicherten Suchen hinzuf�gen"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "L�schen"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Alle zeigen"
 
@@ -13776,14 +14277,86 @@ msgstr "Der pers�nliche Adressbuchserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der pers�nliche Kalenderserver; Kalender-Factory"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarm am %A, %d. %b %Y %H.%M"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "%s zu einer unbekannten Zeit"
+
+#~ msgid "_Invite Others"
+#~ msgstr "Andere _einladen"
+
+#~ msgid "_Confidential"
+#~ msgstr "Vertraulich"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Ordner `%s' kann nicht in sich selbst kopiert werden."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "EDDI:EDDH:EDDK:EDDM"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "EDDI:EDDH:EDDK:EDDM"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Ordner darf das Verzeichnistrennzeichen nicht enthalten."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hallo. Viele Dank daf�r, dass Sie sich die Zeit genommen haben, diese\n"
+#~ "Vorschauversion der Groupware-Suite Ximian Evolution herunterzuladen.\n"
+#~ "\n"
+#~ "Ximian Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt "
+#~ "noch\n"
+#~ "Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
+#~ "\n"
+#~ "Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian."
+#~ "com.\n"
+#~ "Auf dieses Produkt gibt es keinerlei Garantie und es ist nicht f�r\n"
+#~ "Individuen bestimmt, die zu gewaltt�tigen Wutanf�llen neigen.\n"
+#~ "\n"
+#~ "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
+#~ "werden, und wir hoffen auf Ihre Mitarbeit!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Danke.\n"
+#~ "das Ximian-Evolution-Team\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "Format"
diff --git a/po/el.po b/po/el.po
index 9e00bf7c9c..99c3bdf1c2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15.99\n"
-"POT-Creation-Date: 2001-10-24 21:39+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-06 15:55+0100\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -19,6 +19,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -27,480 +36,485 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "���������� ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "����. �����."
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "��� ������"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "����� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Pager"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI �����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "���������� ��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "����������� ������"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -516,24 +530,24 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "����������� ��������"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -542,17 +556,19 @@ 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:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1091
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "������ ���������..."
 
@@ -565,63 +581,63 @@ msgstr "������ �������..."
 msgid "Error in search expression."
 msgstr "������ ���� ������� ����������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "����������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:662
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:663
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -669,44 +685,45 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "���������"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "��� �����"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "_��������"
@@ -744,7 +761,7 @@ msgid "Base"
 msgstr "����������"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "����������"
@@ -839,7 +856,7 @@ msgstr "_��������"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_�����������"
@@ -857,19 +874,30 @@ msgstr "_����:"
 msgid "_Server name:"
 msgstr "����������� ��������"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "������ ������������"
+
+#: addressbook/gui/component/addressbook.c:468
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -877,104 +905,115 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "������� ��� �������� ������������"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 #, fuzzy
 msgid "Email contains"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "����� ���������"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:105
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 #, fuzzy
 msgid "Advanced..."
 msgstr "��������� ��� �������������"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "�������������"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "������_��"
+
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "�����_����� �����������"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "���������� ��� �������..."
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "������ ������������"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -986,39 +1025,39 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 #, fuzzy
 msgid "Remove All"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "������ ������������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "������ ������������"
@@ -1033,7 +1072,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1100,13 +1147,13 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_��������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
@@ -1176,8 +1223,8 @@ msgstr "_��������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1237,53 +1284,59 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "�������� ���������"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 #, fuzzy
 msgid "Edit Full"
 msgstr "_��������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Full Name"
 msgstr "����������� ������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 #, fuzzy
 msgid "E-mail"
 msgstr "_������"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2357,7 +2410,7 @@ msgid "contact-list-editor"
 msgstr "_��������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_��������"
@@ -2407,14 +2460,14 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "��������� ��� �������������"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "���������"
 
@@ -2434,9 +2487,9 @@ msgstr "%d ������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2447,20 +2500,20 @@ msgid "Open"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�������� �������� ���������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "_��������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2469,96 +2522,101 @@ msgid "Print"
 msgstr "�������������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "�������������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 msgid "Success"
 msgstr "��� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1889
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "��������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:483 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "������ ������������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr "�������� �������� ���������"
@@ -2566,7 +2624,7 @@ msgstr "�������� �������� ���������"
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2574,93 +2632,93 @@ msgstr ""
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 #, fuzzy
 msgid "Primary Phone"
 msgstr "�������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 #, fuzzy
 msgid "Home Phone"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Home Address"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Other Phone"
 msgstr "������ ������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 #, fuzzy
 msgid "Other Address"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2854,103 +2912,117 @@ msgstr ""
 msgid "_Font..."
 msgstr "�������������"
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "����������"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "����������"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "�������������"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "�_�������"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "��������"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:617
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:725
-#: calendar/conduits/todo/todo-conduit.c:728
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
@@ -2963,12 +3035,26 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "�_��������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "��_���� ����������"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "����������"
@@ -2992,11 +3078,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "�_�������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3004,7 +3090,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3015,122 +3101,118 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-#, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "������ ���/�����: ������������ ��� Bonobo �������"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr ""
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 #, fuzzy
 msgid "Private"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:460
-#: calendar/gui/e-meeting-time-sel.c:410 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3138,54 +3220,54 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "���"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "������� ���������"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "������� ������"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "������� ��������� ������"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "������� ���������"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "������� ����"
 
@@ -3203,27 +3285,28 @@ msgstr "����"
 msgid "Comment contains"
 msgstr "����"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 #, fuzzy
 msgid "Folder containing appointments and events"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������������"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "�������� ��� �������� �������� �����������"
@@ -3233,7 +3316,7 @@ msgstr "�������� ��� �������� �������� �����������"
 msgid "Create a new appointment"
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�_�������"
@@ -3248,7 +3331,7 @@ msgstr "���������� ��� �������..."
 msgid "New _Task"
 msgstr "��� �������_����"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
@@ -3324,112 +3407,112 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 �����"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d �����"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 �����"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d ������������"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 ������������"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: 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:378
+#: 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:382
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "Send an email"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: 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:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: 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:407
+#: 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:412
+#: 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:421
+#: 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:424
+#: 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:429
+#: 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:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3450,7 +3533,7 @@ msgstr "������������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -3540,7 +3623,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 #, fuzzy
 msgid "Friday"
 msgstr "�������������"
@@ -3556,7 +3639,7 @@ msgid "Minutes"
 msgstr "���������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 #, fuzzy
 msgid "Monday"
 msgstr "������"
@@ -3566,7 +3649,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 #, fuzzy
 msgid "Saturday"
 msgstr "��������"
@@ -3591,7 +3674,7 @@ msgid "Su_n"
 msgstr "��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 #, fuzzy
 msgid "Sunday"
 msgstr "��������"
@@ -3609,7 +3692,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 #, fuzzy
 msgid "Thursday"
 msgstr "������"
@@ -3634,13 +3717,13 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 #, fuzzy
 msgid "Tuesday"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr ""
 
@@ -3718,169 +3801,174 @@ msgstr ""
 msgid "before the start of the appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "������������ "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "����������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "���������� �����_������"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -3900,29 +3988,29 @@ msgstr "�����_����� �����������"
 msgid "Enter Delegate"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 #, fuzzy
 msgid "Appointment"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 #, fuzzy
 msgid "Reminder"
 msgstr "��������"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 #, fuzzy
 msgid "Recurrence"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "_��������"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "������"
@@ -3942,11 +4030,12 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "���������� & ���"
 
@@ -3955,23 +4044,23 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pri_vate"
 msgstr "����������"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
 #: 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 ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "��������"
@@ -3986,15 +4075,19 @@ msgstr "��_���� ����������"
 msgid "_Start time:"
 msgstr "��_���� ����������"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4005,51 +4098,58 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr ""
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "���� ��� ��� �� ���������������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "������"
+msgid "Delegated To"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr ""
+msgid "Language"
+msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "_������"
 
-#: 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
 #, fuzzy
 msgid "Status"
 msgstr "��������� ��������"
 
-#: 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:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4064,36 +4164,37 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 #, fuzzy
 msgid "on"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "on the"
 msgstr "���������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 #, fuzzy
 msgid "occurrences"
 msgstr "�������� �������� ���������"
@@ -4165,19 +4266,15 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4197,7 +4294,7 @@ msgid "Progress"
 msgstr "�_��������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4209,153 +4306,162 @@ msgstr "_�������������"
 msgid "_Status:"
 msgstr "_���������:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "���������:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "��_���� ����������"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:936 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "�������� ���������"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "����_���"
 
-#: calendar/gui/e-calendar-table.c:940 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:942 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:944 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:949
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:951
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-calendar-table.c:1216
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "���� ��� ��� �� ���������������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4368,162 +4474,472 @@ msgstr ""
 msgid "Alarms"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 #, fuzzy
 msgid "End Date"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "�������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
 msgid "Start Date"
 msgstr "��_���� ����������"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "��������� ������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "������"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:524
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:529
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:534
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:538
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "������������ "
+
+#: calendar/gui/e-itip-control.c:581
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "�_����� ������������ ��� Evolution"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "�����_����� �����������"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "��������� ������������"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "�����������"
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:867
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "��_���� ����������"
+
+#: calendar/gui/e-itip-control.c:882
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:883
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "����_�� ������������"
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "�����_����� �����������"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "�������� ��� ���������"
+
+#: calendar/gui/e-itip-control.c:917
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+#, fuzzy
+msgid "Task Proposal"
+msgstr "�������_����"
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "��������� ������������"
+
+#: calendar/gui/e-itip-control.c:932
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:933
+#, fuzzy
+msgid "Task Update Request"
+msgstr "����_�� ������������"
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "�������_����"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "�����_����� �����������"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "����������� ��������"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "����������� ��������"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "����������� ��������"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1071
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "_������"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4566,226 +4982,221 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "��� ����������"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:691
-#: calendar/gui/e-meeting-model.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521 calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529 calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "�������� ������"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:735 calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
-#: calendar/gui/e-meeting-model.c:736
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "����������"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "�_��������"
 
-#: calendar/gui/e-meeting-model.c:1349 calendar/gui/e-meeting-model.c:1462
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1417
-#: calendar/gui/e-meeting-model.c:1464
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1466
-#, fuzzy
-msgid "Optional Participants"
-msgstr "�_����� ������������ ��� Evolution"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1468
-msgid "Non-Participants"
-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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 #, fuzzy
 msgid "_Options"
 msgstr "�_��������"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 #, fuzzy
 msgid "Meeting _end time:"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�������� ���� ���������"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�_�������"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�� ���������� ���"
@@ -4850,242 +5261,282 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 #, fuzzy
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "�������_����"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_���������:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_�������������"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "% ������������"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "����� ���������"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_��������"
+
+#: calendar/gui/print.c:2386
 #, fuzzy
 msgid "Print Calendar"
 msgstr "����������"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 #, fuzzy
 msgid "Print Setup"
 msgstr "�������������"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5093,125 +5544,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 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:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5235,7 +5686,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5243,7 +5694,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5251,15 +5702,15 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -5275,7 +5726,7 @@ msgid "Unable to process spool folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #: camel/camel-filter-driver.c:686
-#, fuzzy
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "��� ��������"
 
@@ -5289,27 +5740,27 @@ msgstr "�������� �������� ���������"
 msgid "Cannot open message"
 msgstr "����������� ��������"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "��� ��������"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -5319,144 +5770,144 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Error executing filter search: %s: %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "����������� ��������"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "�������� ���� ���������"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
@@ -5471,78 +5922,78 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5562,7 +6013,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5572,13 +6023,13 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "�� ���������� ���"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5676,7 +6127,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5693,8 +6144,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr ""
 
@@ -5724,55 +6175,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5817,17 +6268,17 @@ msgstr "�������� �������� ���������"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5835,7 +6286,7 @@ msgid ""
 msgstr "����"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5845,7 +6296,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5857,37 +6308,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "�������� ���� ���������"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�������� ��� ���������"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "�������� ��� ���������"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -5921,54 +6372,54 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "����������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�������� �������� ���������"
@@ -5982,7 +6433,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "��������"
 
@@ -6015,28 +6466,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6044,90 +6495,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "_��������"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6138,83 +6591,83 @@ msgid "Could not save summary: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "�������� �������� ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy
 msgid "No such message"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6229,184 +6682,184 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "�� ���������� ���"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "_��������"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -6416,442 +6869,442 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "��������� ���������"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "����������� ��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "��� ��������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "�������� �������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, fuzzy
 msgid "Help message"
 msgstr "����������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Service ready"
 msgstr "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6859,126 +7312,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 #, fuzzy
 msgid "Sending message"
 msgstr "����������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -7112,126 +7565,126 @@ msgstr ""
 msgid "Attach a file"
 msgstr "��������� �������"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "�������� �������� ���������"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "�������� �������� ���������"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "�������� �������� ���������"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "������� �������"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 #, fuzzy
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr ""
 
@@ -7280,15 +7733,24 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
@@ -7339,30 +7801,30 @@ msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7497,22 +7959,22 @@ msgstr ""
 msgid "Add action"
 msgstr "�_��������"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "������� ��������"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7527,41 +7989,41 @@ msgstr ""
 msgid "Test"
 msgstr "������"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 #, fuzzy
 msgid "Rule name: "
 msgstr "����������� ������"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "����� �����"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "��"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 #, fuzzy
 msgid "Execute actions"
 msgstr "�_��������"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -7770,7 +8232,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 #, fuzzy
 msgid "Sender"
 msgstr "��������"
@@ -7806,7 +8268,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -7819,17 +8281,17 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "_������"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 #, fuzzy
 msgid "Add Rule"
 msgstr "��� ����������"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "_��������"
@@ -7839,105 +8301,100 @@ msgstr "_��������"
 msgid "Score Rules"
 msgstr "_��������"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "���������"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:95
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "_������"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "����������"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "���������� ��� �������..."
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "��_���� ����������"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "�_��������"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "�������������"
@@ -7981,75 +8438,75 @@ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 msgid "Mail configuration interface"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "_��������"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "_��������"
 
-#: mail/component-factory.c:124
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/component-factory.c:142
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "���������"
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:746
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_������"
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_������"
 
-#: mail/component-factory.c:933
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:948
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:1113
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8063,181 +8520,185 @@ msgstr "���������"
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d ����������"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d �� �����������"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d �����������"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "����"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "��������� ���������"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "����"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "����"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "��������� ���������"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "����������� ��������"
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Save As..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_���������� ��� �������..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "��������� ��� �������..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "�������� ��������� ��� ���������������"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr ""
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8338,7 +8799,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8354,54 +8815,54 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "�_��������"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "����"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "_��������"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8409,127 +8870,127 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "��������"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1806
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "��������� ���������"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8537,31 +8998,31 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�������� �������� ���������"
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8603,11 +9064,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "�_����� ������������ ��� Evolution"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "����� ���������"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8616,6 +9082,14 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "�����������"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
@@ -8726,7 +9200,7 @@ msgstr ""
 msgid "Done"
 msgstr "������_��"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 #, fuzzy
 msgid "Drafts"
 msgstr "����������"
@@ -8735,7 +9209,8 @@ msgstr "����������"
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:104
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Edit..."
 msgstr "�������������"
@@ -8883,6 +9358,7 @@ msgid "Sending Mail"
 msgstr "��������"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "��������"
 
@@ -9149,27 +9625,27 @@ msgstr ""
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 #, fuzzy
 msgid "Loading message content"
 msgstr "����������� ��������"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "������� �� ��� ��������"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_��������"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "���������� ��� �������..."
@@ -9188,35 +9664,53 @@ msgstr ""
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "������"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "����� ���������:"
 
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9246,69 +9740,69 @@ msgstr ""
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_���� ��������"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, 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:723
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_���� ��������"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9322,49 +9816,44 @@ msgstr "_���� ��������"
 msgid "Fetching Mail"
 msgstr "��������"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "������������."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "��� ��������"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:891
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr ""
@@ -9379,6 +9868,12 @@ msgstr "���������"
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "�������_����"
+
 #: mail/mail-ops.c:1194
 #, fuzzy
 msgid "Forwarded messages"
@@ -9473,77 +9968,77 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "_Search"
 msgstr "_���������"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(������ ����� �����)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "������ ����� �����"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "���� ������"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "������ ��� ������"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "������:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "�����������:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������������: %s, �����: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "������"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "������� ����"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 #, fuzzy
 msgid "Updating..."
 msgstr "�_��������"
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "�_��������"
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr ""
 
@@ -9551,15 +10046,6 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9570,12 +10056,12 @@ msgstr ""
 msgid "Enter Password"
 msgstr "����������"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "�������� �������� ���������"
@@ -9585,17 +10071,17 @@ msgstr "�������� �������� ���������"
 msgid "Forwarded Message"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9604,17 +10090,22 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "_��������"
+
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "_��������"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 #, fuzzy
 msgid "New VFolder"
 msgstr "_���� ��������"
@@ -9687,7 +10178,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "���������� ������ ���������"
 
@@ -9723,18 +10214,18 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_��������"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "��������� ���������"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -9778,96 +10269,98 @@ msgstr "��� ����������"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "�_�������"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "�_�������"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "��������"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 #, fuzzy
 msgid "Add a news feed"
 msgstr "��� �����"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "��������� ���������"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "�������� �������� ���������"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "��� ����������"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "�������� �������_����"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(����� ���������)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "� ������ ���"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
@@ -9875,36 +10368,63 @@ msgstr ""
 msgid "Weather"
 msgstr "������"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "�_��������"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "�������� ���������"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
+#: my-evolution/metar.c:29
+msgid "�F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "�C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "���������"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_��������"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_��������"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -11212,34 +11732,48 @@ msgstr "����������"
 msgid "The Evolution shell."
 msgstr ""
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 #, fuzzy
 msgid "Show Details"
 msgstr "�������� �������_����"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-setup.c:125
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "�����������"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "�����������"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "_��������"
+
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11247,14 +11781,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11262,7 +11796,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11271,7 +11805,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11279,6 +11813,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "�_����� ������������ ��� Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -11342,11 +11889,17 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Rename the \"%s\" folder to:"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
@@ -11354,52 +11907,30 @@ msgid ""
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "���..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11408,13 +11939,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11422,132 +11953,154 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "�������� �������� ���������"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "�������� �������� ���������"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 #, fuzzy
 msgid "Filename:"
 msgstr "����������� ������"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 #, fuzzy
 msgid "Select a file"
 msgstr "�����_����� �����������"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "����� �������:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "��� %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "������� ��������"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "�������� ���������..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
+#: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr ""
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr ""
 
@@ -11583,11 +12136,15 @@ msgid "Error executing %s."
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "����� �� �������"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
@@ -11595,45 +12152,35 @@ msgstr "����� ����� �������"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1595
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1597
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1656
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11641,311 +12188,304 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1879 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1881
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1887 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 #, fuzzy
 msgid "_Small Icons"
 msgstr "����� ���������"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 #, fuzzy
 msgid "_Large Icons"
 msgstr "������ ���������"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "_New Group..."
 msgstr "��� �����"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "������� �� _��� ��������"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "�������� ��� ���������"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "����������� ������"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "��������"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "������ ������������"
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "������������"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "�����������"
-
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 #, fuzzy
 msgid "CORBA error"
 msgstr "������ ������������"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 #, fuzzy
 msgid "Invalid argument"
 msgstr "��� ���������"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 #, fuzzy
 msgid "No owner"
 msgstr "������_��"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 #, fuzzy
 msgid "Not found"
 msgstr "��������� ���������"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "�������� �������� ���������"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 #, fuzzy
 msgid "Internal error"
 msgstr "������ ������������"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 #, fuzzy
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 #, fuzzy
 msgid "Invalid URI"
 msgstr "URI �����������"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 #, fuzzy
 msgid "Has subfolders"
 msgstr "�������� ��� ���������"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 #, fuzzy
 msgid "No space left"
 msgstr "��������� ���������"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -11953,7 +12493,7 @@ msgid ""
 "Unknown error."
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -11962,7 +12502,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12071,74 +12611,71 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "�������� �������� ���������"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "�_��������"
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:265
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/main.c:344
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:387
+#: shell/main.c:332
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "�������� �������� ���������"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "������� �������"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "���������"
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12463,12 +13000,13 @@ msgstr "�������������"
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 #, fuzzy
 msgid "Save"
 msgstr "����������"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save and Close"
 msgstr "����������"
@@ -12485,7 +13023,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_������"
@@ -12509,7 +13047,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "����������"
@@ -12575,10 +13113,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13229,7 +13763,7 @@ msgstr "�������� �������� ���������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr ""
@@ -13264,7 +13798,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
 #, fuzzy
-msgid "F_ormat"
+msgid "For_mat"
 msgstr "���"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -13319,7 +13853,7 @@ msgid "Save in folder..."
 msgstr "���������� ��� �������..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 #, fuzzy
 msgid "Save the current file"
 msgstr "�������� ���� ��� �������� ������������"
@@ -13424,7 +13958,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr ""
 
@@ -13441,7 +13975,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_�������"
 
@@ -13709,10 +14243,6 @@ msgstr "�������� ��� ������ ������������"
 msgid "_Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -13796,129 +14326,139 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "������"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "�����������"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "������� �������"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "�����������"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "������������"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "���"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "������� ������ ����������: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "����..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "_��������"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 #, fuzzy
 msgid "Save Search"
 msgstr "�� ���������� ���"
 
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "�� ���������� ���"
+
+#: widgets/misc/e-filter-bar.h:96
+#, fuzzy
+msgid "Clear"
+msgstr "����������"
+
 #: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr ""
@@ -13946,11 +14486,11 @@ msgstr "��������� ���������"
 msgid "Don't show this message again."
 msgstr "�������� �������� ���������"
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "���_������"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -13965,114 +14505,42 @@ msgstr "��� ����������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #, fuzzy
-#~ msgid "Other Contacts"
-#~ msgstr "������ ������������"
-
-#, fuzzy
-#~ msgid "(none)"
-#~ msgstr "������_��"
-
-#, fuzzy
-#~ msgid "Notification about your appointment"
-#~ msgstr "�_�������"
-
-#, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "���� ��� ��� �� ���������������"
+#~ msgid "GnomeCard:"
+#~ msgstr "����������"
 
 #, fuzzy
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "���������"
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #, fuzzy
-#~ msgid "Task begins: <b>"
-#~ msgstr "���������"
+#~ msgid "F_ormat"
+#~ msgstr "���"
 
 #, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "���������"
+#~ msgid "Notification about your appointment"
+#~ msgstr "�_�������"
 
 #, fuzzy
 #~ msgid "<b>Description:</b> %s"
 #~ msgstr "����"
 
 #, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "�_����� ������������ ��� Evolution"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "������"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "��_���� ����������"
-
-#, fuzzy
-#~ msgid "Meeting Update Request"
-#~ msgstr "����_�� ������������"
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "������"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "�����_����� �����������"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "�������� ��� ���������"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "�_����� ������������ ��� Evolution"
-
-#, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "�������_����"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "��������� ������������"
-
-#, fuzzy
-#~ msgid "Task Update Request"
-#~ msgstr "����_�� ������������"
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "�������_����"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "����������"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "����������� ��������"
-
-#, fuzzy
 #~ msgid "Summarising folder"
 #~ msgstr "_���� ��������"
 
@@ -14081,61 +14549,17 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #, fuzzy
-#~ msgid "Account %d"
-#~ msgstr "����� ���������"
-
-#, fuzzy
-#~ msgid "%s: Inbox"
-#~ msgstr "�����������"
-
-#, fuzzy
 #~ msgid "Encrypted message"
 #~ msgstr "�������� ��� ���������"
 
 #, fuzzy
-#~ msgid "Trash"
-#~ msgstr "�������_����"
-
-#, fuzzy
-#~ msgid "VFolders"
-#~ msgstr "_��������"
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
 #, fuzzy
-#~ msgid "knots"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "miles"
-#~ msgstr "_��������"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "_��������"
-
-#, fuzzy
 #~ msgid "_Imperial"
 #~ msgstr "����������"
 
-#, fuzzy
-#~ msgid "Outbox"
-#~ msgstr "�����������"
-
-#, fuzzy
-#~ msgid "Local Folders"
-#~ msgstr "_��������"
-
-#, fuzzy
-#~ msgid "Add to Saved Searches"
-#~ msgstr "�� ���������� ���"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "����������"
-
 #~ msgid "Sent By:"
 #~ msgstr "�������� ���:"
 
@@ -14144,10 +14568,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "����������"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "�_����� ������������ ��� Evolution"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "�������� �������� ���������"
 
@@ -14160,10 +14580,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "�������� �������� ���������"
 
 #, fuzzy
-#~ msgid "Evolution Shortcuts"
-#~ msgstr "�_����� ������������ ��� Evolution"
-
-#, fuzzy
 #~ msgid "Delete folder '%s'"
 #~ msgstr "�������� �������� ���������"
 
@@ -14172,10 +14588,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "����������� ������"
 
 #, fuzzy
-#~ msgid "_Import File..."
-#~ msgstr "���������"
-
-#, fuzzy
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
@@ -14220,10 +14632,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "��������"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "�������� �������� ���������"
 
@@ -14264,10 +14672,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "�_�������"
 
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "�������_����"
-
-#, fuzzy
 #~ msgid "The message is not understandable."
 #~ msgstr "��������� ���������"
 
@@ -14392,10 +14796,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "�������� �������� ���������"
 
 #, fuzzy
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#, fuzzy
 #~ msgid "Add to Calendar"
 #~ msgstr "�� ���������� ���"
 
@@ -14649,8 +15049,8 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ "An error occured when trying to fetch\n"
 #~ "pilot list from the gnome-pilot daemon"
 #~ msgstr ""
-#~ "�������� �������� ���� ��� �������� ��������� ��������� �� PersistStream ��� "
-#~ "�� ������"
+#~ "�������� �������� ���� ��� �������� ��������� ��������� �� PersistStream "
+#~ "��� �� ������"
 
 #, fuzzy
 #~ msgid "Evolution Calendar Conduit"
@@ -14878,7 +15278,8 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr ""
-#~ "��� ����������, � ������������ ��� ���������� �������� ��� Evolution �������."
+#~ "��� ����������, � ������������ ��� ���������� �������� ��� Evolution "
+#~ "�������."
 
 #~ msgid "Clos_e All Items"
 #~ msgstr "��_������ ����"
diff --git a/po/en_AU.po b/po/en_AU.po
index f95386d6c5..204523b872 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -21,477 +29,482 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -507,23 +520,23 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -532,82 +545,84 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr ""
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -651,39 +666,39 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr ""
 
@@ -716,7 +731,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr ""
 
@@ -795,16 +810,16 @@ msgstr ""
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr ""
@@ -821,22 +836,27 @@ msgstr ""
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -844,48 +864,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -898,51 +918,51 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -954,48 +974,57 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1055,12 +1084,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
@@ -1127,9 +1156,9 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr ""
@@ -1196,37 +1225,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2291,7 +2329,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr ""
 
@@ -2336,149 +2374,156 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr ""
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2486,75 +2531,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2735,94 +2789,107 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+msgid "Untitled appointment"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
@@ -2834,46 +2901,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr ""
-
-#: 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:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
+msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
@@ -2893,11 +2939,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2905,7 +2951,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -2916,185 +2962,168 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:181
+msgid "Could not create the alarm notify service"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+msgid "Searching"
+msgstr ""
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr ""
 
@@ -3110,12 +3139,12 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr ""
 
@@ -3123,9 +3152,9 @@ msgstr ""
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
@@ -3134,24 +3163,24 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr ""
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -3221,48 +3250,48 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr ""
 
@@ -3319,17 +3348,12 @@ msgstr ""
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3350,7 +3374,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3380,7 +3404,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr ""
 
@@ -3433,7 +3457,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr ""
 
@@ -3446,7 +3470,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr ""
 
@@ -3455,7 +3479,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr ""
 
@@ -3476,7 +3500,7 @@ msgid "Su_n"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr ""
 
@@ -3493,7 +3517,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr ""
 
@@ -3514,12 +3538,12 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr ""
 
@@ -3588,168 +3612,172 @@ msgstr ""
 msgid "before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+msgid "Could not update object!"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -3766,25 +3794,25 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr ""
 
@@ -3803,11 +3831,12 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr ""
 
@@ -3816,12 +3845,12 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
@@ -3831,7 +3860,7 @@ msgid "Show Time As"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr ""
 
@@ -3843,32 +3872,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr ""
 
@@ -3908,6 +3924,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -3926,7 +3943,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -3941,7 +3958,8 @@ msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -3952,23 +3970,23 @@ msgstr "_Other Organiser"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4032,19 +4050,15 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4063,7 +4077,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4075,138 +4089,165 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+msgid "Deleting selected objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr ""
 
@@ -4237,8 +4278,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr ""
 
@@ -4250,313 +4291,381 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+msgid "Meeting ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+msgid "Task Completed: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+msgid "iCalendar Error"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+msgid "An unknown person"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
+#: calendar/gui/e-itip-control.c:779
+msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:795
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:811
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+msgid "Send Latest Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4597,193 +4706,215 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr ""
-
 #: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, c-format
+msgid "Opening calendar at %s"
+msgstr ""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -4840,232 +4971,274 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/print.c:2262
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2280
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2294
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2320
+#, c-format
+msgid "Categories: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2331
+msgid "Contacts: "
+msgstr ""
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5073,125 +5246,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5215,7 +5388,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5223,7 +5396,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5231,104 +5404,105 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
-msgstr "Can not parse search expression: %s\n"
+msgstr ""
+"Can not parse search expression: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5337,187 +5511,187 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Can not build locking helper pipe: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Can not fork locking helper: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Can not sign this message: no plaintext to sign"
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Can not sign this message: no password provided"
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Can not sign this message: could not create pipe to GPGP/PGP: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Can not sign this message: no plaintext to clearsign"
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Can not verify this message: no plaintext to verify"
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Can not verify this message: could not create pipe to GPGP/PGP: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Can not verify this message: could not create temporary file: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Can not encrypt this message: no plaintext to encrypt"
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Can not encrypt this message: no password provided"
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Can not encrypt this message: could not create pipe to GPGP/PGP: %s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Can not decrypt this message: no ciphertext to decrypt"
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Can not decrypt this message: no password provided"
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Can not decrypt this message: could not create pipe to GPGP/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5537,7 +5711,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5547,12 +5721,12 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5650,7 +5824,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5667,8 +5841,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr ""
 
@@ -5697,55 +5871,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5789,15 +5963,15 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5805,7 +5979,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5815,7 +5989,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5834,34 +6008,38 @@ msgstr ""
 "State: %s\n"
 "Country: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
+#, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
 
@@ -5893,57 +6071,57 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
 
@@ -5951,7 +6129,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr ""
 
@@ -5983,28 +6161,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6012,88 +6190,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6104,23 +6284,27 @@ msgid "Could not save summary: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+msgid "Maildir append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c: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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6129,54 +6313,54 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6191,29 +6375,33 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Can not open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+msgid "Mail append cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6222,140 +6410,148 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Synchronising folder"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
+#, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:172
+msgid "MH append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -6365,451 +6561,435 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Can not open MH directory path: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Can not append message to spool file: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders can not be deleted"
 
-#. 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 "Synchronising folder"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6817,172 +6997,173 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.c:168
 #: composer/e-msg-composer-attachment.c:184
+#, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
@@ -7008,52 +7189,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7064,115 +7245,123 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's composer."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr ""
 
@@ -7220,15 +7409,24 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7279,30 +7477,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7430,22 +7628,22 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7460,39 +7658,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -7685,7 +7883,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr ""
 
@@ -7717,7 +7915,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr ""
@@ -7730,15 +7928,15 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr ""
 
@@ -7746,97 +7944,94 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
+#, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr ""
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr ""
 
@@ -7872,239 +8067,244 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
-msgid "Virtual Rubbish Bin"
+#: mail/component-factory.c:102
+msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
+#, c-format
 msgid "Cannot connect to store: %s"
 msgstr ""
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail config component."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's folder info component."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr ""
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr ""
@@ -8126,33 +8326,41 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Current store format:"
+msgid "Body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Mailbox Format"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "New store format:"
+msgid "Indexing:"
 msgstr ""
 
 #: mail/local-config.glade.h:4
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:5
+msgid "New store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr ""
 
@@ -8170,22 +8378,22 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr ""
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 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:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8201,52 +8409,52 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr ""
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8254,123 +8462,123 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8378,30 +8586,30 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8443,16 +8651,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8463,16 +8671,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -8489,31 +8697,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:6
+msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
-msgid "Accounts"
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
+msgid "Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8525,26 +8733,22 @@ msgid "Authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
+msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8554,332 +8758,352 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+msgid "Re_member this password"
+msgstr ""
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
-msgid "Sent and Draft Messages"
+#: mail/mail-config.glade.h:74
+msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
+#: mail/mail-config.glade.h:75
+msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Server Configuration"
+#: mail/mail-config.glade.h:76
+msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:77
+msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Authentication Type: "
+msgstr ""
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
-msgid "_Email Address:"
+#: mail/mail-config.glade.h:97
+msgid "_Drafts folder:"
 msgstr ""
 
 #: mail/mail-config.glade.h:99
-msgid "_Empty trash folders on exit"
+msgid "_Email Address:"
 msgstr ""
 
 #: mail/mail-config.glade.h:100
-msgid "_Full Name:"
+msgid "_Empty trash folders on exit"
 msgstr ""
 
 #: mail/mail-config.glade.h:101
-msgid "_HTML Signature:"
+msgid "_Full Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:102
-msgid "_Highlight citations with"
+msgid "_HTML Signature:"
 msgstr ""
 
 #: mail/mail-config.glade.h:103
-msgid "_Host:"
+msgid "_Highlight citations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "_Load images if sender is in addressbook"
+msgid "_Host:"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
-msgid "_Log filter actions to:"
+msgid "_Load images if sender is in addressbook"
 msgstr ""
 
 #: mail/mail-config.glade.h:106
-msgid "_Mark messages as Read after"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:107
-msgid "_Name:"
+msgid "_Mark messages as Read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:108
-msgid "_Never load images off the net"
+msgid "_Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:109
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+msgid "_Server Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr ""
 
@@ -8919,224 +9143,201 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr ""
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr ""
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "I do not recognise this type of calendar component."
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
+#, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-mt.c:567
-msgid "Enter Password"
-msgstr ""
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9144,151 +9345,149 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:877
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
-msgid "Rubbish Bin"
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
-
+#: mail/mail-ops.c:1378
+#, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
+#, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
+#, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
@@ -9296,103 +9495,114 @@ msgstr ""
 msgid "_Search"
 msgstr ""
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr ""
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
+#, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
 #: mail/mail-vfolder.c:203
+#, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9401,28 +9611,28 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr ""
@@ -9483,7 +9693,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr ""
 
@@ -9509,26 +9719,26 @@ msgstr ""
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -9568,120 +9778,115 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Can not initialise Evolution's Executive Summary component."
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr ""
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo.\n"
 
@@ -9737,7 +9942,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -9809,1061 +10014,1058 @@ msgstr ""
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+msgid "Spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+msgid "Partial spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -10872,7 +11074,7 @@ msgid " _Remove"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
@@ -10887,12 +11089,12 @@ msgstr ""
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -10932,11 +11134,11 @@ msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
+msgid "Show temperatures in:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:20
@@ -10956,11 +11158,11 @@ msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
+msgid "_Fahrenheit"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
@@ -10995,37 +11197,37 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr ""
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11033,14 +11235,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11048,7 +11250,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11057,7 +11259,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11065,6 +11267,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+msgid "Evolution "
+msgstr ""
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11077,58 +11291,64 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr ""
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11136,50 +11356,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11188,13 +11387,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11202,183 +11401,193 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#: shell/e-shell-startup-wizard.c:168
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:209
-msgid "Bug buddy could not be run."
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:235
-msgid "Ximian Evolution"
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: 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."
+#: shell/e-shell-view-menu.c:165
+msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:173
+msgid "Bug buddy could not be run."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
 
@@ -11386,45 +11595,35 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11432,210 +11631,301 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Can not create folder lock on %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/evolution-shell-component.c:1009
+msgid "CORBA error"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+msgid "No owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1019
+msgid "Not found"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+msgid "Unsupported operation"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1027
+msgid "Internal error"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1031
+msgid "Exists"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1033
+msgid "Invalid URI"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1037
+msgid "Has subfolders"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1039
+msgid "No space left"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr ""
@@ -11726,70 +12016,64 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:236
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Can not initialise the Bonobo component system."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr ""
+
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -11879,7 +12163,7 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr ""
@@ -11901,7 +12185,7 @@ msgid "_Forward Contact..."
 msgstr ""
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr ""
@@ -11946,7 +12230,7 @@ msgstr ""
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr ""
 
@@ -12069,11 +12353,12 @@ msgstr ""
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr ""
 
@@ -12089,7 +12374,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr ""
@@ -12111,7 +12396,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr ""
 
@@ -12171,10 +12456,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -12196,7 +12477,7 @@ msgid "Create or edit virtual folder definitions"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:7
-msgid "Empty _Rubbish Bin"
+msgid "Empty _Trash"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:8
@@ -12428,279 +12709,307 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Display the next important message"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:18
-msgid "Display the next message"
+msgid "Display the next important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:19
-msgid "Display the next unread message"
+msgid "Display the next message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:20
-msgid "Display the next unread thread"
+msgid "Display the next unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:21
-msgid "Display the previous important message"
+msgid "Display the next unread thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:22
-msgid "Display the previous message"
+msgid "Display the previous important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:23
-msgid "Display the previous unread message"
+msgid "Display the previous message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List..."
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:28
-msgid "Force images in HTML mail to be loaded"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:29
-msgid "Forward"
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:30
-msgid "Forward As"
+msgid "Forward"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:31
-msgid "Forward _Attached"
+msgid "Forward As"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Inline"
+msgid "Forward _Attached"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Quoted"
+msgid "Forward _Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward the selected message in the body of a new message"
+msgid "Forward _Quoted"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward the selected message quoted like a reply"
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Forward the selected message to someone"
+msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Load _Images"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Increase the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark as I_mportant"
+msgid "Load _Images"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:43
+msgid "Mark as I_mportant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+msgid "_Larger"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr ""
@@ -12711,7 +13020,7 @@ msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr ""
@@ -12742,11 +13051,11 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+msgid "For_mat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
@@ -12794,7 +13103,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr ""
 
@@ -12887,7 +13196,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr ""
 
@@ -12903,7 +13212,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr ""
 
@@ -13139,10 +13448,6 @@ msgstr ""
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -13214,132 +13519,136 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr ""
 
@@ -13382,25 +13691,26 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Could not initialise GNOME-VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Could not initialise GNOME"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#, fuzzy
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr ""
+#~ msgid "Summarising folder"
+#~ msgstr "Synchronising folder"
 
-#, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Can not initialise Evolution's Executive Summary component."
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
 
 #, fuzzy
 #~ msgid "Synchronizing folder"
@@ -13410,22 +13720,10 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "%m/%d/%Y"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr ""
-
-#, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colours for Tasks"
 
 #, fuzzy
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "I do not recognise this type of calendar component."
-
-#, fuzzy
 #~ msgid "Organizer: "
 #~ msgstr "Organisation:"
 
@@ -13433,10 +13731,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#, fuzzy
-#~ msgid "Factory for the test component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
 #~ msgid "Synchronize"
 #~ msgstr "Synchronise"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 5d339d6a52..9942fabbf9 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,6 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -21,478 +30,483 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Colours"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -508,23 +522,23 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -533,82 +547,84 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr ""
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -653,39 +669,39 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr ""
 
@@ -718,7 +734,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr ""
 
@@ -797,16 +813,16 @@ msgstr ""
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr ""
@@ -823,22 +839,28 @@ msgstr ""
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -846,48 +868,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -900,51 +922,51 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -956,48 +978,57 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1057,12 +1088,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
@@ -1130,9 +1161,9 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr ""
@@ -1199,37 +1230,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2297,7 +2337,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr ""
 
@@ -2342,149 +2382,156 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr ""
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2492,75 +2539,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2742,99 +2798,112 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+msgid "Untitled appointment"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
@@ -2847,46 +2916,26 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+msgid "invalid time"
 msgstr ""
 
-#: 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:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
-msgid "Notification about your task ending on %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
+msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
@@ -2907,11 +2956,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2919,7 +2968,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -2930,38 +2979,38 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise Bonobo"
+msgid "Could not create the alarm notify service"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
@@ -2969,149 +3018,132 @@ msgstr "%m/%d/%Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+msgid "Searching"
+msgstr ""
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr ""
 
@@ -3127,12 +3159,12 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr ""
 
@@ -3140,9 +3172,9 @@ msgstr ""
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
@@ -3151,24 +3183,24 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr ""
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -3238,48 +3270,48 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr ""
 
@@ -3336,17 +3368,12 @@ msgstr ""
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3367,7 +3394,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3397,7 +3424,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr ""
 
@@ -3451,7 +3478,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr ""
 
@@ -3464,7 +3491,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr ""
 
@@ -3473,7 +3500,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr ""
 
@@ -3494,7 +3521,7 @@ msgid "Su_n"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr ""
 
@@ -3512,7 +3539,7 @@ msgid "Tas_ks due today:"
 msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr ""
 
@@ -3533,12 +3560,12 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr ""
 
@@ -3607,168 +3634,172 @@ msgstr ""
 msgid "before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+msgid "Could not update object!"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -3785,25 +3816,25 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr ""
 
@@ -3822,11 +3853,12 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr ""
 
@@ -3835,12 +3867,12 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
@@ -3850,7 +3882,7 @@ msgid "Show Time As"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr ""
 
@@ -3862,32 +3894,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr ""
 
@@ -3927,6 +3946,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -3945,7 +3965,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -3962,7 +3982,8 @@ msgid "_Change Organizer"
 msgstr "Organisation:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -3974,23 +3995,23 @@ msgstr "Organisation:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4054,19 +4075,15 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4085,7 +4102,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4097,138 +4114,165 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+msgid "Deleting selected objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr ""
 
@@ -4259,8 +4303,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr ""
 
@@ -4272,313 +4316,381 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+msgid "Meeting ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+msgid "Task Completed: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+msgid "iCalendar Error"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+msgid "An unknown person"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
+#: calendar/gui/e-itip-control.c:779
+msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:795
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:811
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+msgid "Send Latest Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4619,193 +4731,215 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr ""
-
 #: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, c-format
+msgid "Opening calendar at %s"
+msgstr ""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -4862,233 +4996,275 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/print.c:2262
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2280
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2294
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2320
+#, c-format
+msgid "Categories: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2331
+msgid "Contacts: "
+msgstr ""
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5096,125 +5272,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5238,7 +5414,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5246,7 +5422,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5254,105 +5430,105 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5361,187 +5537,187 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5561,7 +5737,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5571,12 +5747,12 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5674,7 +5850,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5691,8 +5867,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr ""
 
@@ -5721,55 +5897,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5813,16 +5989,16 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5830,7 +6006,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5840,7 +6016,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5852,37 +6028,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
@@ -5915,57 +6091,57 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
 
@@ -5973,7 +6149,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr ""
 
@@ -6005,28 +6181,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6034,88 +6210,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6126,77 +6304,81 @@ msgid "Could not save summary: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+msgid "Maildir append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6211,171 +6393,182 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:265
+msgid "Mail append cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:172
+msgid "MH append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -6385,452 +6578,435 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6838,167 +7014,167 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -7030,52 +7206,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7086,116 +7262,124 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr ""
 
@@ -7243,15 +7427,24 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7310,30 +7503,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7461,22 +7654,22 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7491,39 +7684,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -7716,7 +7909,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr ""
 
@@ -7748,7 +7941,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr ""
@@ -7761,15 +7954,15 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr ""
 
@@ -7777,99 +7970,95 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr ""
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr ""
 
@@ -7911,242 +8100,246 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr ""
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr ""
@@ -8169,33 +8362,41 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Current store format:"
+msgid "Body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Mailbox Format"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "New store format:"
+msgid "Indexing:"
 msgstr ""
 
 #: mail/local-config.glade.h:4
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:5
+msgid "New store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr ""
 
@@ -8213,22 +8414,22 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr ""
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 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:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8244,52 +8445,52 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr ""
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8297,123 +8498,123 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8421,30 +8622,30 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8486,16 +8687,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8506,16 +8707,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -8533,31 +8734,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:6
+msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
-msgid "Accounts"
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
+msgid "Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8569,27 +8770,23 @@ msgid "Authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
+msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8599,333 +8796,355 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+msgid "Re_member this password"
+msgstr ""
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
+#: mail/mail-config.glade.h:76
+msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Authentication Type: "
+msgstr ""
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+msgid "_Server Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr ""
 
@@ -8965,226 +9184,202 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr ""
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr ""
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr ""
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-mt.c:567
-msgid "Enter Password"
-msgstr ""
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9193,154 +9388,149 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
@@ -9349,95 +9539,104 @@ msgstr "Synchronise \"%s\""
 msgid "_Search"
 msgstr ""
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr ""
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
@@ -9447,7 +9646,7 @@ msgstr "Synchronising \"%s\""
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9456,29 +9655,29 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr ""
@@ -9539,7 +9738,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr ""
 
@@ -9565,26 +9764,26 @@ msgstr ""
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -9626,121 +9825,115 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
+msgid "Cannot initialize Evolution's Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr ""
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
@@ -9797,7 +9990,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -9869,1061 +10062,1058 @@ msgstr ""
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+msgid "Spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+msgid "Partial spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -10932,7 +11122,7 @@ msgid " _Remove"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
@@ -10948,12 +11138,12 @@ msgstr "Synchronising \"%s\""
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -10993,11 +11183,11 @@ msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
+msgid "Show temperatures in:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:20
@@ -11018,11 +11208,11 @@ msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
+msgid "_Fahrenheit"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
@@ -11058,37 +11248,37 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr ""
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11096,14 +11286,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11111,7 +11301,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11120,7 +11310,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11128,6 +11318,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11140,60 +11343,66 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Synchronising \"%s\""
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11201,50 +11410,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11253,13 +11441,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11267,186 +11455,194 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Cannot initialise Evolution's mail storage hash."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's mail storage hash."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:209
-msgid "Bug buddy could not be run."
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:235
-#, fuzzy
-msgid "Ximian Evolution"
-msgstr "Cannot initialise the Evolution shell."
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: 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."
+#: shell/e-shell-view-menu.c:165
+msgid "Bug buddy was not found in your $PATH."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:173
+msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
 
@@ -11454,45 +11650,35 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11500,210 +11686,302 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/evolution-shell-component.c:1009
+msgid "CORBA error"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+msgid "No owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1019
+msgid "Not found"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+msgid "Unsupported operation"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1027
+msgid "Internal error"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1031
+msgid "Exists"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1033
+msgid "Invalid URI"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Synchronising \"%s\""
+
+#: shell/evolution-shell-component.c:1039
+msgid "No space left"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr ""
@@ -11794,71 +12072,65 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr ""
+
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -11948,7 +12220,7 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr ""
@@ -11970,7 +12242,7 @@ msgid "_Forward Contact..."
 msgstr ""
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr ""
@@ -12015,7 +12287,7 @@ msgstr ""
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr ""
 
@@ -12140,11 +12412,12 @@ msgstr ""
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr ""
 
@@ -12160,7 +12433,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr ""
@@ -12182,7 +12455,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr ""
 
@@ -12242,10 +12515,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -12499,279 +12768,307 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Display the next important message"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:18
-msgid "Display the next message"
+msgid "Display the next important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:19
-msgid "Display the next unread message"
+msgid "Display the next message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:20
-msgid "Display the next unread thread"
+msgid "Display the next unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:21
-msgid "Display the previous important message"
+msgid "Display the next unread thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:22
-msgid "Display the previous message"
+msgid "Display the previous important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:23
-msgid "Display the previous unread message"
+msgid "Display the previous message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List..."
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:28
-msgid "Force images in HTML mail to be loaded"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:29
-msgid "Forward"
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:30
-msgid "Forward As"
+msgid "Forward"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:31
-msgid "Forward _Attached"
+msgid "Forward As"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Inline"
+msgid "Forward _Attached"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Quoted"
+msgid "Forward _Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward the selected message in the body of a new message"
+msgid "Forward _Quoted"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward the selected message quoted like a reply"
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Forward the selected message to someone"
+msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Load _Images"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Increase the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark as I_mportant"
+msgid "Load _Images"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:43
+msgid "Mark as I_mportant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+msgid "_Larger"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr ""
@@ -12782,7 +13079,7 @@ msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
@@ -12814,11 +13111,11 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+msgid "For_mat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
@@ -12866,7 +13163,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr ""
 
@@ -12959,7 +13256,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr ""
 
@@ -12975,7 +13272,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr ""
 
@@ -13213,10 +13510,6 @@ msgstr ""
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -13288,134 +13581,138 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "Organisation"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr ""
 
@@ -13458,22 +13755,30 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -13489,10 +13794,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "%m/%d/%Y"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Factory for the Evolution executive summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -13501,10 +13802,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "Colours for display"
 
 #, fuzzy
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Organizer: "
 #~ msgstr "Organisation:"
 
diff --git a/po/es.po b/po/es.po
index 769903fbc9..179af0c58f 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-10-27 22:12+0200\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-12 22:43+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -30,291 +30,296 @@ msgstr "Factor�a para importar archivos VCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nombre"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Correo electr�nico"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Ppal"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Trab"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Comp"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "M�vil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Fax de Trab"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Trab 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:475
-#: addressbook/gui/contact-editor/e-contact-editor.c:1632
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Correo electr�nico 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:485
-#: addressbook/gui/contact-editor/e-contact-editor.c:1633
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Correo electr�nico 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Dep"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Off"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "T�tulo"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profesi�n"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Encarg"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asist"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Nick"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "C�nyuge"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI del calendario"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "DISUrl"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Aniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Cumplea�os"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categor�as"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Apellido"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -322,7 +327,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -330,7 +335,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -338,7 +343,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -346,7 +351,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -354,7 +359,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -362,7 +367,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -370,7 +375,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -378,7 +383,7 @@ msgstr ""
 "\n"
 "Direcci�n:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -386,7 +391,7 @@ msgstr ""
 "\n"
 "  Direcci�n postal: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -394,7 +399,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -402,7 +407,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -410,7 +415,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -418,7 +423,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -426,7 +431,7 @@ msgstr ""
 "\n"
 "  C�digo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -434,7 +439,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -442,7 +447,7 @@ msgstr ""
 "\n"
 "Etiqueta de env�o: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -450,7 +455,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -458,7 +463,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -466,7 +471,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -474,7 +479,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -482,7 +487,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -490,7 +495,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -498,7 +503,7 @@ msgstr ""
 "\n"
 "Localizaci�n geogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -506,7 +511,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -514,7 +519,7 @@ msgstr ""
 "\n"
 "Organizaci�n: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -522,7 +527,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -530,7 +535,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -538,7 +543,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -546,7 +551,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -554,7 +559,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -562,7 +567,7 @@ msgstr ""
 "\n"
 "categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -580,7 +585,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -588,7 +593,7 @@ msgstr ""
 "\n"
 "Cadena �nica: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -596,11 +601,11 @@ msgstr ""
 "\n"
 "Llave p�blica: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "VCards M�ltiples"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -609,10 +614,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:1509
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1424
-#: calendar/conduits/todo/todo-conduit.c:1126
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
 #: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -620,7 +625,7 @@ msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -633,35 +638,35 @@ msgstr "Cargando..."
 msgid "Error in search expression."
 msgstr "Error buscando la expresi�n."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Conectando al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "No pude conectarme al servidor LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Esperando la conexi�n al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "A�adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la b�squeda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Reiniciando b�squeda."
 
@@ -673,20 +678,20 @@ msgstr "No pude cargar el cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:1066
-#: calendar/conduits/calendar/calendar-conduit.c:966
-#: calendar/conduits/todo/todo-conduit.c:691
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1067
-#: calendar/conduits/calendar/calendar-conduit.c:967
-#: calendar/conduits/todo/todo-conduit.c:692
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:1097
-#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de direcciones del pilot"
 
@@ -731,8 +736,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:71
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -891,7 +897,7 @@ msgstr "_A�adir"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
@@ -909,15 +915,20 @@ msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:105
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "No se puede inicializar gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:465
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -927,7 +938,7 @@ msgstr ""
 "que ha introducido una URI err�nea, o que el servidor LDAP est�\n"
 "ca�do"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -939,7 +950,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -947,42 +958,42 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contrase�a para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:757
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:760
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:758
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:759
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:760
-#: calendar/gui/cal-search-bar.c:58
+#: addressbook/gui/component/addressbook.c:763
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Categor�a es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
-#: calendar/gui/cal-search-bar.c:411
+#: addressbook/gui/component/addressbook.c:1005
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Cualquier categor�a"
 
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrar� el visor de carpetas"
 
@@ -991,47 +1002,47 @@ msgstr "La URI que mostrar� el visor de carpetas"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:177
+#: addressbook/gui/component/e-address-popup.c:178
 msgid "(none)"
 msgstr "(nada)"
 
-#: addressbook/gui/component/e-address-popup.c:465
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
 
-#: addressbook/gui/component/e-address-popup.c:578
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Elija un archivo"
 
-#: addressbook/gui/component/e-address-popup.c:584
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crear nuevo contacto �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:596
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "A�adir direcci�n al contacto existente �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:882
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Consultando la Agenda de Direcciones..."
 
-#: addressbook/gui/component/e-address-popup.c:958
+#: addressbook/gui/component/e-address-popup.c:973
 #: addressbook/gui/component/e-address-widget.c:387
 #: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Editar informaci�n de contacto"
 
-#: addressbook/gui/component/e-address-popup.c:988
+#: addressbook/gui/component/e-address-popup.c:1003
 #: addressbook/gui/component/e-address-widget.c:423
 #: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "A�adir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Fusionar Direcciones de Correo"
 
@@ -1052,9 +1063,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:765
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1083,7 +1094,7 @@ msgstr "(%d no mostrado)"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:523
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1098,7 +1109,15 @@ msgstr ""
 "Trowbridge <trow@ximian.com> con una descripci�n detallada de las "
 "circunstancias bajo las que ocurri� este error.  Gracias."
 
-#: addressbook/gui/component/select-names/e-select-names.c:601
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la agenda"
 
@@ -1158,7 +1177,7 @@ msgstr "Colaboraci�n"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1233,8 +1252,8 @@ msgstr "_Contactos..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:701 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1293,36 +1312,43 @@ msgid "_Web page address:"
 msgstr "Direcci�n de la p�gina _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 "�Esta seguro que quiere borrar esta cuenta?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:753
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto est� en estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2229
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No pude encontrar el widget para el campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "A�adir Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Editar Todo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "Correo electr�nico"
 
@@ -2402,7 +2428,7 @@ msgid "contact-list-editor"
 msgstr "editor-de-listas-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -2452,7 +2478,7 @@ msgstr ""
 "ya existen en esta carpeta.  �Quiere a�adirlo de todos modos?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "B�squeda avanzada"
 
@@ -2476,9 +2502,9 @@ msgstr "%d tarjetas"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:1406
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
@@ -2489,19 +2515,19 @@ msgid "Open"
 msgstr "Abrir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
 #
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2509,12 +2535,12 @@ msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:741 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:282 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:17
@@ -2522,20 +2548,20 @@ msgstr "Imprimir cabecera"
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:67
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:971
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2544,7 +2570,7 @@ msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2561,9 +2587,10 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:40
-#: calendar/gui/calendar-model.c:755 calendar/gui/calendar-model.c:1200
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:607
-#: camel/camel-service.c:643
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2571,31 +2598,36 @@ msgstr "Cancelar"
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:58
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "�Desea guardar los cambios?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Error a�adiendo lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:58
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Error a�adiendo tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:67
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
-#: addressbook/gui/widgets/e-addressbook-view.c:1279
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
 #. 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:379
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2603,80 +2635,80 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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:384
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aqu� para a�adir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Tel�fono principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Tel�fono del asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Tel�fono del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Tel�fono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Tel�fono de la compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Tel�fono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Direcci�n del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Direcci�n de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Tel�fono m�vil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Tel�fono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Tel�fono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Tel�fono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Otro tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Otra direcci�n"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "y otras %s tarjetas."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "y una tarjeta m�s."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
@@ -2880,40 +2912,49 @@ msgstr "Imprimir tarjeta"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: calendar/cal-util/cal-util.c:424 calendar/cal-util/cal-util.c:446
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Editas cita"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:426 calendar/cal-util/cal-util.c:448
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:428 calendar/cal-util/cal-util.c:450
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/conduits/calendar/calendar-conduit.c:922
-#: calendar/conduits/todo/todo-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1051
-#: calendar/conduits/calendar/calendar-conduit.c:1054
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:753
-#: calendar/conduits/todo/todo-conduit.c:756
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaci�n ToDo de la pilot"
 
@@ -2970,11 +3011,27 @@ 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Configuraci�n"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indexando:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "tiempo no v�lido"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas en %s"
 
@@ -3040,94 +3097,101 @@ msgstr "No pude crear el servicio de la alarma de notificaci�n"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factor�a del servicio de la alarma de notificaci�n"
 
-#: calendar/gui/calendar-commands.c:438
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:441 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1400 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:466
+#: calendar/gui/calendar-commands.c:474
 #: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:676
+#: calendar/gui/calendar-commands.c:805
 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:416 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:419 calendar/gui/calendar-model.c:999
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:422
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:528
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:528
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:530
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:530
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:595 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:597 calendar/gui/e-meeting-time-sel.c:409
-#: shell/evolution-shell-component.c:993
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:746 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:749 calendar/gui/calendar-model.c:1196
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:752 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:315 calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3138,36 +3202,38 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1192 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1452 widgets/misc/e-dateedit.c:1567
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:299
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "No"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2009 calendar/gui/e-day-view.c:1674
-#: calendar/gui/e-week-view.c:1181
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Buscando"
 
@@ -3187,24 +3253,24 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "La descripci�n contiene"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:415
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "No coincidente"
 
 #: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -3212,8 +3278,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:245
-#: my-evolution/e-summary-tasks.c:261 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
@@ -3226,7 +3293,7 @@ msgstr "Carpeta que contiene elementos por hacer"
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3446
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
@@ -3243,23 +3310,23 @@ msgstr "Nueva _tarea"
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� el calendario"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opciones de las Alarmas Auditivas"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Opciones de los Mensajes de Alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Opciones de Alarmas Desconocidas"
 
@@ -3436,7 +3503,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -3736,23 +3803,23 @@ 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:178 calendar/gui/print.c:2163
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2167
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2169
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2174
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2176
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Falta "
 
@@ -3760,35 +3827,35 @@ msgstr "Falta "
 msgid "Could not update object!"
 msgstr "�No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:671
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:676
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:679
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:696
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1046 mail/mail-callbacks.c:1845
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1050 mail/mail-callbacks.c:1852
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3797,53 +3864,53 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "�Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1094 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1249
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�Esta seguro que quiere borrar la cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�Esta seguro que quiere borrar esta cita sin t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�Esta seguro que quiere borrar la tarea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�Esta seguro que quiere borrar esta tarea sin t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�Esta seguro que quiere borrar la entrada del diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�Esta seguro que quiere borrar esta entrada del diario sin t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "�Esta seguro que quiere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "�Esta seguro que quiere borrar %d tareas?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�Esta seguro que quiere borrar %d entradas del diario?"
@@ -3860,7 +3927,7 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Cita"
 
@@ -3873,12 +3940,12 @@ msgid "Recurrence"
 msgstr "Recurrencia"
 
 #: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:354
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Planificaci�n"
 
 #: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:357
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Reuni�n"
 
@@ -3921,7 +3988,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"
 
@@ -3938,15 +4005,20 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Es necesario por lo menos un asistente"
+
 #: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "�Esa persona ya est� participando en la reuni�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -3957,49 +4029,56 @@ 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"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Pulse aqu� para a�adir un contacto *"
 
 #: 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-itip-control.c:798
 #: 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: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:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4014,8 +4093,9 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Invitar a otros"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Invitar a otros..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
@@ -4105,10 +4185,6 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "a�o(s)"
 
-#: calendar/gui/dialogs/save-comp.c:50
-msgid "Do you want to save changes?"
-msgstr "�Desea guardar los cambios?"
-
 #: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "La informaci�n de la reuni�n ha cambiado. �Enviar versi�n actualizada?"
@@ -4136,7 +4212,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4149,12 +4225,12 @@ msgid "_Status:"
 msgstr "E_stado:"
 
 #: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:229
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
@@ -4168,76 +4244,132 @@ msgstr "Fecha de Ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2723
-#: calendar/gui/e-week-view.c:1821
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:938 calendar/gui/e-day-view.c:3467
-#: calendar/gui/e-week-view.c:3321 mail/folder-browser.c:1444
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
 #: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:942 calendar/gui/e-day-view.c:3476
-#: calendar/gui/e-week-view.c:3330 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:944 calendar/gui/e-day-view.c:3478
-#: calendar/gui/e-week-view.c:3332 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:946 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-day-view.c:3480 calendar/gui/e-week-view.c:3308
-#: calendar/gui/e-week-view.c:3334 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:951
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:953
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:958
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1140 calendar/gui/e-day-view.c:6954
-#: calendar/gui/e-week-view.c:3815
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1223
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para a�adir una tarea"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:119 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:122 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:127
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4252,48 +4384,48 @@ msgstr ""
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:720
-#: camel/camel-filter-driver.c:836
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 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
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 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"
 
@@ -4304,101 +4436,406 @@ 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:284 calendar/gui/e-day-view.c:1386
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3448 calendar/gui/e-week-view.c:3303
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3458 calendar/gui/e-week-view.c:3313
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3460 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3488 calendar/gui/e-week-view.c:3348
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3490 calendar/gui/e-week-view.c:3350
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3492 calendar/gui/e-week-view.c:3352
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora de _fin de la reuni�n:"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "(Completado "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informaci�n del calendario"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Calendario"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "un remitente desconocido"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Elija un archivo"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Fecha"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Aceptado"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Tentativa"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Rechazado"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "_Publicar la informaci�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "informaci�n del calendario"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Obtener la ultima informaci�n de las reuniones"
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Informaci�n Opcional"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Reuni�n"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _fin de la reuni�n:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Obtener la ultima informaci�n de las reuniones"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Reuni�n"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Elija un archivo"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Buscar en Mensaje"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Obtener la �ltima informaci�n de la tarea"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "Informaci�n"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "estaba despu�s de"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Obtener la �ltima informaci�n de la tarea"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Cancelar Operaci�n"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mensaje del Calendario"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "_Publicar la informaci�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "_Publicar la informaci�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL de _disponibilidad:"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL de _disponibilidad:"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Mensaje previo"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "La carpeta parece estar corrompida e irrecuperable."
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Este mensaje solo contiene destinatarios Bcc."
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "�El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "�El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inv�lido!\n"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "�El estado de asistencia no puedo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�No pude quitar el elemento del archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1304 calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1306 calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1506
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 "�No pude encontrar ninguna de tus identidades en la lista de participantes!\n"
@@ -4440,90 +4877,99 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Presidentes"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Participantes requeridos"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Participantes opcionales"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "No participan"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Habitaci�n"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
 #: camel/providers/smtp/camel-smtp-transport.c:222
 #: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Silla"
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Necesita acci�n"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "En proceso"
 
-#: calendar/gui/e-meeting-model.c:1349 calendar/gui/e-meeting-model.c:1462
-msgid "Chair Persons"
-msgstr "Presidentes"
-
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1417
-#: calendar/gui/e-meeting-model.c:1464
-msgid "Required Participants"
-msgstr "Participantes requeridos"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1466
-msgid "Optional Participants"
-msgstr "Participantes opcionales"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1468
-msgid "Non-Participants"
-msgstr "No participan"
-
 #. 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
@@ -4535,14 +4981,14 @@ msgstr "%A, %d de %B de %Y"
 #. 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:2053 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m %d %Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1576
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -4554,10 +5000,6 @@ msgstr "Fuera de la oficina"
 msgid "No Information"
 msgstr "Sin informaci�n"
 
-#: calendar/gui/e-meeting-time-sel.c:427
-msgid "_Invite Others..."
-msgstr "_Invitar a otros..."
-
 #: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opci�nes"
@@ -4625,21 +5067,21 @@ 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 est� implementado"
 
-#: calendar/gui/e-week-view.c:3301 calendar/gui/e-week-view.c:3339
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1315
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1326
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no est� implementado"
 
-#: calendar/gui/gnome-cal.c:1681
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
@@ -4869,53 +5311,90 @@ msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1830
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1853
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1850
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1854 calendar/gui/print.c:1856
-#: calendar/gui/print.c:1857
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1869
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1876
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "A�o seleccionado (%Y)"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "_Tarea"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "E_stado:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridad:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Fecha Completada:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"categor�as: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Co_ntactos:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2476 calendar/gui/print.c:2568
-#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:606
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2505
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2586
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Configurar impresi�n"
 
@@ -5127,7 +5606,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resincronizando con el servidor"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 
@@ -5135,48 +5614,48 @@ msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:661
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:670
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:685
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:690
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:920
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:926
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
@@ -5232,26 +5711,26 @@ msgstr "(concordar todas) requiere un �nico resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando b�squeda en cabecera desconocida: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido en el contenido del cuerpo, esperando una cadena"
 
-#: camel/camel-lock-client.c:109
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "No pude crear un conducto(pipe) para la ayuda: %s"
 
-#: camel/camel-lock-client.c:122
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "No puedo hacer un fork del ayudante de bloqueo: %s"
 
-#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "No puedo bloquear '%s': error de protocolo con el ayudante de bloqueo"
 
-#: camel/camel-lock-client.c:211
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "No puedo bloquear '%s'"
@@ -5341,63 +5820,63 @@ msgstr "Por favor introduzca su frase de paso%s %s"
 msgid "Please enter your %s passphrase"
 msgstr "Por favor introduzca su frase de paso %s"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 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:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 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:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:728
+#: camel/camel-pgp-context.c:741
 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:920
+#: camel/camel-pgp-context.c:939
 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:926
+#: camel/camel-pgp-context.c:945
 #, 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:937
+#: camel/camel-pgp-context.c:956
 #, 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:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "No puedo cifrar este mensaje: no hay texto plano a cifrar"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "No puedo cifrar este mensaje: no se facilit� la contrase�a"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo cifrar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "No puedo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "No puedo descifrar este mensaje: no hay texto cifrado a descifrar"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "No puedo descifrar este mensaje: no se facilito la contrase�a"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo descifrar este mensaje: no pude comunicar con GPG/PGP: %s"
@@ -5443,12 +5922,12 @@ msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconect� inesperadamente: %s"
@@ -5560,7 +6039,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaci�n err�nea desde el servidor."
 
@@ -5701,15 +6180,15 @@ msgstr "Error al decodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No puedo obtener la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-store.c:278
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No puedo crear la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5719,7 +6198,7 @@ msgstr ""
 "Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5734,7 +6213,7 @@ msgstr ""
 "\n"
 "�Quieres aceptarlo de todos modos?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5768,22 +6247,22 @@ msgstr "No existe el mensaje %s en %s"
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
 
-#: camel/camel-vee-store.c:251
+#: camel/camel-vee-store.c:258
 #, 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:286
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No puedo borrar la carpeta: %s: No existe tal"
 
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:306
 #, 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:307
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
@@ -5816,40 +6295,40 @@ msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1536
-#: camel/providers/imap/camel-imap-folder.c:1945
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1684
-#: camel/providers/imap/camel-imap-folder.c:1765
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informaci�n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1690
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:1982
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -5858,10 +6337,10 @@ msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 msgid "Could not open cache directory: %s"
 msgstr "No puedo abrir directorio de cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:242
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Error al cachear el mensaje %s: %s"
@@ -5874,7 +6353,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:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -5906,29 +6385,29 @@ 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:520
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:530
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticaci�n %s no est� implementado"
 
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:569
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:595
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5939,12 +6418,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:894
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1182
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
@@ -5984,53 +6463,55 @@ msgstr "Mbox est�ndar de Unix"
 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:131
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-spool-store.c:109
 #, 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:138
+#: camel/providers/local/camel-local-store.c:145
 #, 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:146
-#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No pude acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:177
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenes locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:189
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:246
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:288
+#: camel/providers/local/camel-local-store.c:374
 #, 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:298
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el �ndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:366
+#: camel/providers/local/camel-local-summary.c:367
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No puedo guardar el resumen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:422
+#: camel/providers/local/camel-local-summary.c:423
 #: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude a�adir mensajes al resumen: raz�n desconocida"
@@ -6116,7 +6597,7 @@ msgstr "No pude borrar la carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:330
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%s': %s"
@@ -6797,7 +7278,7 @@ msgstr "No puedo enviar el mensaje: direcci�n del remitente no definida."
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no v�lida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -7032,7 +7513,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7041,29 +7522,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7071,16 +7552,16 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7089,7 +7570,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7098,7 +7579,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7107,7 +7588,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7115,7 +7596,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesi�n previa.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7125,23 +7606,23 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7149,7 +7630,7 @@ msgstr ""
 "No puedo crear una ventana de composici�n:\n"
 "No puedo activar el control de selecci�n de direcciones."
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7157,7 +7638,7 @@ msgstr ""
 "No pude crear una ventana de composici�n:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7165,7 +7646,7 @@ msgstr ""
 "No pude crear una ventana de composici�n, porque no ha configurado\n"
 "todav�a ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
@@ -7228,13 +7709,13 @@ msgstr "Recordar esta clave durante el resto de esta sesi�n"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -7285,30 +7766,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1384 widgets/misc/e-dateedit.c:1611
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1381 widgets/misc/e-dateedit.c:1608
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7431,7 +7912,7 @@ msgstr "%b %d %l:%M %p"
 msgid "<click here to select a date>"
 msgstr "<pinche aqu� para a�adir una fecha>"
 
-#: filter/filter-editor.c:133 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
@@ -7444,7 +7925,7 @@ msgstr "Entonces"
 msgid "Add action"
 msgstr "A�adir acci�n"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7452,16 +7933,16 @@ msgstr ""
 "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:233 filter/vfolder-rule.c:356
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Escribir URI de la carpeta"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<pinche aqu� para seleccionar una carpeta>"
 
@@ -7478,39 +7959,39 @@ msgstr ""
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Sin t�tulo"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "si se cumple alg�n criterio"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "A�adir criterio"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "saliente"
 
@@ -7703,7 +8184,7 @@ msgstr "Respondido a"
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Remitente"
 
@@ -7735,7 +8216,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
@@ -7748,15 +8229,15 @@ msgstr "estaba despu�s de"
 msgid "was before"
 msgstr "estaba antes de"
 
-#: filter/rule-editor.c:161
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reglas"
 
-#: filter/rule-editor.c:257
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "A�adir Regla"
 
-#: filter/rule-editor.c:322
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Editar Regla"
 
@@ -7782,20 +8263,20 @@ msgstr "Importando..."
 msgid "Please wait"
 msgstr "Por favor espere"
 
-#: importers/elm-importer.c:170 importers/netscape-importer.c:707
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
 #: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s como %s"
 
-#: importers/elm-importer.c:376 importers/netscape-importer.c:800
-#: importers/pine-importer.c:505
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Guardando %s"
 
-#: importers/elm-importer.c:527 importers/netscape-importer.c:973
-#: importers/pine-importer.c:668 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Correo"
 
@@ -7811,15 +8292,11 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:229
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:230 importers/pine-importer.c:673
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
-#: importers/evolution-gnomecard-importer.c:249
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7831,19 +8308,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando su vieja informaci�n de Netscape"
 
-#: importers/netscape-importer.c:903 importers/pine-importer.c:601
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: importers/netscape-importer.c:912
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: importers/netscape-importer.c:978
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Configuraci�n"
 
-#: importers/netscape-importer.c:999
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7855,7 +8332,7 @@ msgstr ""
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution est� importando tu vieja informaci�n de Pine"
 
-#: importers/pine-importer.c:694
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7863,7 +8340,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:722
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -7899,40 +8376,40 @@ msgstr "Factor�a para el componente de Resumen de Correo."
 msgid "Mail configuration interface"
 msgstr "Interfaz de configuraci�n del correo"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Carpeta para guardar correo (interno)"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papeleras virtuales"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "No puedo conectar con el almac�n: %s"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:751
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -7940,30 +8417,30 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nuevo _mensaje de correo"
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "No puedo inicializar el componente de configuraci�n de correo de Evolution."
 
-#: mail/component-factory.c:958
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "No puedo inicializar el componente de informaci�n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1157
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
@@ -7976,164 +8453,164 @@ msgstr "Propiedades para �%s�"
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Crear carpeta virtual de la b�squeda"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "A�adir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtrar seg�n la lista de correo"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
@@ -8237,7 +8714,7 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
@@ -8274,27 +8751,27 @@ msgstr "�Esta seguro que quiere borrar esta cuenta de noticias?"
 msgid "Mail Settings"
 msgstr "Configuraci�n del correo"
 
-#: mail/mail-autofilter.c:69
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:212
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:228
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "A�adir Regla de Filtro"
 
@@ -8394,20 +8871,20 @@ msgstr "un remitente desconocido"
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "En %a, %Y-%m-%d a %H:%M, %%s escribi�:"
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1701
+#: mail/mail-callbacks.c:1732
 #, 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:1726
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8415,7 +8892,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1765
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8423,28 +8900,28 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1779
+#: mail/mail-callbacks.c:1810
 #, 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:1805
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1901
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Aviso"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8456,11 +8933,11 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2084
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: mail/mail-callbacks.c:2192
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8469,19 +8946,19 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2204
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2267
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2313
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2446
 #, 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?"
@@ -8538,10 +9015,15 @@ msgstr ""
 "Este nombre solo se usar� para mostrar informaci�n."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Cuenta"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8553,6 +9035,14 @@ msgstr ""
 "%s\n"
 "No se crear�n atajos."
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Correo entrante"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
@@ -8665,7 +9155,7 @@ msgstr "Mostrar"
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Borradores"
 
@@ -8673,8 +9163,8 @@ msgstr "Borradores"
 msgid "E_nable"
 msgstr "_Habilitado"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -8811,6 +9301,7 @@ msgid "Sending Mail"
 msgstr "Enviando Correo"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Enviado"
 
@@ -9058,23 +9549,23 @@ msgstr "Ocultar"
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1615
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:1617
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:1620
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:1623
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
@@ -9091,30 +9582,50 @@ msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Este mensaje est� firmado digitalmente y es aut�ntico."
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+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:1838
+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:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9144,11 +9655,11 @@ msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:701
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9157,27 +9668,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:754
+#: mail/mail-local.c:763
 #, 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:800
+#: mail/mail-local.c:815
 #, 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:1213
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1228
+#: mail/mail-local.c:1296
 #, 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:1250
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9185,16 +9696,16 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1407
 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:1348
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9203,7 +9714,7 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9212,121 +9723,122 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:85
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Carpeta de filtrado"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Aun as�, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando �%s�"
 
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:790
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:892
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "No puedo copiar una carpeta `%s' sobre si misma."
-
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en �%s�"
 
-#: mail/mail-ops.c:1195
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "Turco"
+
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1310
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1762
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9335,7 +9847,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9344,11 +9856,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9357,17 +9869,17 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2093
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
@@ -9473,17 +9985,17 @@ msgstr "Mensaje reenviado"
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando vfolder: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9496,16 +10008,21 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "Carpetas"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:799
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
 
-#: mail/mail-vfolder.c:853
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -9574,7 +10091,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -9610,16 +10127,16 @@ msgstr "Suscribiendo a carpeta �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta �%s�"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ning�n servidor"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -9687,35 +10204,37 @@ msgstr "%l:%M %d %B"
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:79
-msgid "KBOS:ZSAM:EGAA"
-msgstr "LEMD:LEVS:LEVC"
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 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:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nombre:"
 
-#: my-evolution/e-summary-preferences.c:1488
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Configuraci�n del resumen"
 
@@ -9728,11 +10247,11 @@ msgstr "Error obteniendo RDF"
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
-#: my-evolution/e-summary-tasks.c:246
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-tasks.c:285
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Sin descripci�n)"
 
@@ -9748,27 +10267,19 @@ msgstr "<dd><b>No se ha podido conectar con el servidor de tiempo</b></dd>"
 msgid "Weather"
 msgstr "Tiempo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS:EGAA:RJTT"
-msgstr "LEMD:LEVS:LEVC"
-
 #: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regiones"
 
-#: my-evolution/e-summary.c:186
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:567 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimir resumen"
 
-#: my-evolution/e-summary.c:613
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresi�n del resumen"
 
@@ -11083,6 +11594,20 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Correo entrante"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetas Especiales"
+
 #: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
@@ -11393,7 +11918,7 @@ msgstr "Importa datos y configuraci�n de programas antiguos"
 msgid "Import a single file"
 msgstr "Importar un �nico archivo"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11401,11 +11926,11 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
@@ -11427,6 +11952,7 @@ msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
 #: shell/e-shell-startup-wizard.c:159
+#, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
 "(%s)"
@@ -11438,7 +11964,7 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "No pude iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#: shell/e-shell-startup-wizard.c:744
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11446,6 +11972,25 @@ msgstr ""
 "Por favor seleccione la informaci�n\n"
 "que quiera importar"
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "No ha especificado un nombre de archivo."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+"El nombre de la carpeta no puede contener el car�cter de retorno de carro."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Esta carpeta no contiene mensajes."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' y '..' son nombres reservados de carpetas."
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
@@ -11495,38 +12040,38 @@ msgstr "_Trabajar Desconectado"
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:213
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1589
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1623
 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:1643
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1649
+#: shell/e-shell-view.c:1636
 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:653
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
@@ -11542,10 +12087,6 @@ msgstr ""
 "\"%s\" ha fallado inesperadamente. Deber� salir de Evolution y volver\n"
 "a entrar para poder acceder otra vez a esa informaci�n."
 
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
 #: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
@@ -11683,10 +12224,6 @@ msgstr "Error guardando atajos."
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Correo entrante"
-
 #: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
@@ -11762,63 +12299,63 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Ya tiene un due�o"
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Sin due�o"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Operaci�n no soportada"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "URI no v�lida"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "El antiguo due�o a muerto"
 
@@ -11975,62 +12512,24 @@ msgstr "Evolution puede importar datos de los siguiente s archivos:"
 msgid "Evolution is now exiting ..."
 msgstr "Evolution esta terminando ..."
 
-#: shell/main.c:193
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hola. Gracias por tomarse la molestia de descargar esta liberaci�n de "
-"prueba\n"
-"de la herramienta de trabajo en grupo Ximian Evolution.\n"
-"\n"
-"Ximian Evolution todav�a no est� completa. Se est� acercando, pero hay\n"
-"sitios donde faltan las utilidades o solo funcionan a medias. \n"
-"\n"
-"Si encuentra errores, por favor rep�rtelos usando bugzilla.ximian.com.\n"
-"Este producto viene sin garant�a y no est� destinado a individuos con\n"
-"tendencia a sufrir violentos ataques de ira.\n"
-"\n"
-"Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
-"�esperamos sus contribuci�nes!\n"
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Gracias\n"
-"El equipo de Ximian Evolution\n"
-
-#: shell/main.c:268
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No puedo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:347
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Deshabilitar pantalla de entrada"
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:390
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -12332,11 +12831,12 @@ msgstr "Imprimir..."
 
 #: 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:236
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Guardar"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
@@ -12352,7 +12852,7 @@ msgstr "Guardar este elemento a disco"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Archivo"
@@ -12374,7 +12874,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -12435,10 +12935,6 @@ msgstr "Concertar un encuentro para este elemento"
 msgid "Customise My Evolution"
 msgstr "Personalizar Mi Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar la operaci�n de correo actual"
@@ -13006,7 +13502,7 @@ msgstr "Cerrar esta ventana"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Cerrar"
@@ -13037,8 +13533,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Encripta este mensaje con su Certificado de Encriptaci�n S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormatear"
+#, fuzzy
+msgid "For_mat"
+msgstr "Formatear"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13089,7 +13586,7 @@ msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -13182,7 +13679,7 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -13198,7 +13695,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -13527,15 +14024,15 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Hoy"
 
-#: widgets/misc/e-cell-date-edit.c:741
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
@@ -13621,23 +14118,23 @@ msgstr "Codificaci�n de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:149
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor de b�squedas"
 
-#: widgets/misc/e-filter-bar.c:165
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "A�adir a las b�squedas guardadas"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Mostrar todo"
 
@@ -13680,70 +14177,83 @@ 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:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): no pude inicializar GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): no pude inicializar GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
-#~ msgid "Alarm on %A %b %d %Y %H:%M"
-#~ msgstr "Alarma en %A %b %d %Y %H:%M"
-
-#~ msgid "%s at an unknown time"
-#~ msgstr "%s en un momento desconocido"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Confidencial"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
+#~ msgid "_Invite Others"
+#~ msgstr "_Invitar a otros"
 
-#~ msgid "20%"
-#~ msgstr "20%"
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
 
-#~ msgid "30%"
-#~ msgstr "30%"
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "No puedo copiar una carpeta `%s' sobre si misma."
 
-#~ msgid "40%"
-#~ msgstr "40%"
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "LEMD:LEVS:LEVC"
 
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "LEMD:LEVS:LEVC"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hola. Gracias por tomarse la molestia de descargar esta liberaci�n de "
+#~ "prueba\n"
+#~ "de la herramienta de trabajo en grupo Ximian Evolution.\n"
+#~ "\n"
+#~ "Ximian Evolution todav�a no est� completa. Se est� acercando, pero hay\n"
+#~ "sitios donde faltan las utilidades o solo funcionan a medias. \n"
+#~ "\n"
+#~ "Si encuentra errores, por favor rep�rtelos usando bugzilla.ximian.com.\n"
+#~ "Este producto viene sin garant�a y no est� destinado a individuos con\n"
+#~ "tendencia a sufrir violentos ataques de ira.\n"
+#~ "\n"
+#~ "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
+#~ "�esperamos sus contribuci�nes!\n"
 
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Gracias\n"
+#~ "El equipo de Ximian Evolution\n"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "F_ormat"
+#~ msgstr "F_ormatear"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarma en %A %b %d %Y %H:%M"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "%s at an unknown time"
+#~ msgstr "%s en un momento desconocido"
 
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr ""
-#~ "El nombre de la carpeta no puede contener el car�cter de retorno de carro."
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
 
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "La carpeta no puede contener el separador de directorio."
 
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' y '..' son nombres reservados de carpetas."
-
 #~ msgid "%s - Ximian Evolution %s"
 #~ msgstr "%s - Ximian Evolution %s"
 
@@ -13774,15 +14284,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Pulse el icono para descifrar."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Este mensaje est� firmado digitalmente y es aut�ntico."
-
-#~ 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."
-
 #~ 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"
 
diff --git a/po/fi.po b/po/fi.po
index ce3c26f024..4332d71469 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -21,305 +29,310 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Name"
 msgstr "Nimi:"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "S�hk�posti"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Ensisijainen"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Ty�"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "vuotta"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Kopioi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Auto"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Ty�/faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Ty�/faksi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Ty� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ty� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Koti 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Muut"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "S�hk�posti 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "S�hk�posti 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Asema"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Toukokuu"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Kalenteri"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Ryhm�t"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Koko nimi"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -327,7 +340,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -335,7 +348,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -343,7 +356,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -351,7 +364,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -359,13 +372,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -373,7 +386,7 @@ msgstr ""
 "\n"
 "Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -381,7 +394,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -389,13 +402,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -403,7 +416,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -411,13 +424,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -425,7 +438,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -433,13 +446,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -447,7 +460,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -455,7 +468,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -463,7 +476,7 @@ msgstr ""
 "\n"
 "S�hk�posti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -471,13 +484,13 @@ msgstr ""
 "\n"
 "S�hk�posti:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -485,7 +498,7 @@ msgstr ""
 "\n"
 "Aikavy�hyke: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -493,19 +506,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -513,7 +526,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -521,7 +534,7 @@ msgstr ""
 "\n"
 "  Yksikk�: "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -529,7 +542,7 @@ msgstr ""
 "\n"
 "  Yksikk�2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -537,7 +550,7 @@ msgstr ""
 "\n"
 "  Yksikk�3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -545,7 +558,7 @@ msgstr ""
 "\n"
 "  Yksikk�4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -553,7 +566,7 @@ msgstr ""
 "\n"
 "Ryhm�t: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -569,13 +582,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -583,11 +596,11 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -596,86 +609,88 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Etsi"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Odotetaan..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Ladataan kalenteria..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -719,43 +734,43 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontaktit"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "NNTP-palvelin"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "_Kontaktiluettelo"
@@ -790,7 +805,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr ""
 
@@ -870,16 +885,16 @@ msgstr "_Tilin nimi:"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Lis��"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -896,22 +911,28 @@ msgstr "_Portti:"
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -919,50 +940,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Nimi sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "S�hk�posti sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Ryhm�t"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Ryhm�t:"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -976,51 +997,51 @@ msgstr ""
 msgid "(none)"
 msgstr "(Ei nime�)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Ensisijainen s�hk�posti"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Valitse toiminto"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Luo uusi kontakti \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lis�� osoite olemassaolevaan kontaktiin \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Lis�� kontakteihin"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "�l� salli kyselyj�"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Salli kyselyt (Vaarallista!)"
 
@@ -1032,50 +1053,59 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Poista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Poista kaikki"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "L�het� HTML-postia?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1137,12 +1167,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1210,9 +1240,9 @@ msgstr "_Kontaktit..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Poista"
@@ -1282,37 +1312,47 @@ msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalis�ys"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "S�hk�posti"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "on"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2446,7 +2486,7 @@ msgid "contact-list-editor"
 msgstr "Kontaktinhallinta"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Kontaktinhallinta"
@@ -2496,154 +2536,161 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Etsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " %d sekuntia"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Avaa"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "L�het� viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 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:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "Ty�skentele poissa linjoilta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "I/O-virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Haluatko tallentaa muutokset?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr "Virhe %s:n lataamisessa"
@@ -2651,7 +2698,7 @@ msgstr "Virhe %s:n lataamisessa"
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2659,75 +2706,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Ty�puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Ty�osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Ty�puhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2910,97 +2966,110 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "Kirjasin..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 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/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
+msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
@@ -3012,47 +3081,29 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr ""
-
-#: 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:165
-msgid "Notification about your appointment"
-msgstr ""
-
-#: 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Asetukset"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "_Loppumisaika:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "N�yt� asetukset"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3073,11 +3124,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3085,7 +3136,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3096,39 +3147,39 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Bonobon alustus ei onnistunut"
+msgid "Could not create the alarm notify service"
+msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -3136,156 +3187,137 @@ msgstr "%A, %e %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"P�iv�ys tulee antaa seuraavassa muodossa: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Etsi"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "_N�yt�"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "Ty�viikk_o"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "Viikko"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "Kuukausi"
@@ -3303,12 +3335,12 @@ msgstr "Kuvaus:"
 msgid "Comment contains"
 msgstr "Kommentti sis�lt��"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -3316,9 +3348,9 @@ msgstr "Kalenteri"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Teht�v�t"
@@ -3327,25 +3359,25 @@ msgstr "Teht�v�t"
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri n�ytt��"
 
@@ -3420,52 +3452,52 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d p�iv��"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr " 1 p�iv�"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr " 1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekunti"
@@ -3524,17 +3556,12 @@ msgstr "Luo uusi tapaaminen"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3556,7 +3583,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -3587,7 +3614,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -3643,7 +3670,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -3658,7 +3685,7 @@ msgid "Minutes"
 msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -3667,7 +3694,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -3692,7 +3719,7 @@ msgid "Su_n"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -3711,7 +3738,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -3736,12 +3763,12 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Tiistai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -3825,121 +3852,126 @@ msgstr "Ke"
 msgid "before the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Haluatko todella poistaa teht�v�n '%s'?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Tiedostojen p�ivitys ei onnistunut"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3947,53 +3979,53 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
@@ -4013,26 +4045,26 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
@@ -4052,12 +4084,13 @@ msgid "Classification"
 msgstr "Luokittelu"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Luottamuksellinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "P�iv�ys & Aika"
 
@@ -4067,12 +4100,12 @@ msgid "F_ree"
 msgstr "_Viikko"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
@@ -4083,7 +4116,7 @@ msgid "Show Time As"
 msgstr "N�yt�"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
@@ -4095,35 +4128,19 @@ msgstr "_Loppumisaika:"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Autopuhelin"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "Pakolliset tiedot"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Valinnaiset tiedot"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -4167,6 +4184,7 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4185,7 +4203,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -4201,7 +4219,8 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4213,23 +4232,23 @@ msgstr "Organisoija:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "p�iv�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4295,19 +4314,15 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Haluatko tallentaa muutokset?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4326,7 +4341,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4338,142 +4353,173 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "_Alkamisp�iv�:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Poista valitut kontaktit"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Poista t�m� teht�v�"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"P�iv�ys tulee antaa seuraavassa muodossa: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Valmis"
 
@@ -4504,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -4517,331 +4563,411 @@ msgstr ""
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "P_oista t�m� tapaaminen"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Tiedoksi"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalenteri"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Tuntematon virhe"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Valitse toiminto"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Teht�v�t"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Hyv�ksy "
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Kuvaus:"
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Tiedoksi"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 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:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4882,86 +5008,105 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autopuhelin"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Ryhm�n nimi:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Paperil�hde:"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lis�� toiminto"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "Ammatti"
@@ -4969,113 +5114,119 @@ 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:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr ""
-
 #: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Tulosta kalenteri"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -5132,233 +5283,278 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Teht�v�"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Tila:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioriteetti:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Valmis"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Ryhm�t: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Kontaktit"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5366,125 +5562,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5508,7 +5704,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5516,7 +5712,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5524,104 +5720,104 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "L�hetet��n viesti�"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5630,197 +5826,197 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Lukitus ep�onnistui: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen v�liaikaistiedostoon %s ep�onnistui: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti ep�onnistui: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus ep�onnistui: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "VIrhe luettaessa viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa v�liaikaista viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, 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:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, 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:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:699
+#: camel/camel-pgp-context.c:741
 #, 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:891
+#: camel/camel-pgp-context.c:939
 #, 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:897
+#: camel/camel-pgp-context.c:945
 #, 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:908
+#: camel/camel-pgp-context.c:956
 #, 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:1076
+#: camel/camel-pgp-context.c:1129
 #, 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:1086
+#: camel/camel-pgp-context.c:1139
 #, 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:1093
+#: camel/camel-pgp-context.c:1146
 #, 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:1102
+#: camel/camel-pgp-context.c:1155
 #, 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:1264
+#: camel/camel-pgp-context.c:1323
 #, 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:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, 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"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen ep�onnistui: J�rjestelm�si ei tue moduulien "
 "lataamista."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5840,7 +6036,7 @@ msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5850,12 +6046,12 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5953,7 +6149,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5970,8 +6166,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Salasana"
 
@@ -6001,55 +6197,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6095,17 +6291,17 @@ msgstr "Viestin salauksen purkaminen ep�onnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6113,7 +6309,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6123,7 +6319,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6135,37 +6331,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseist� viesti�: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -6198,57 +6394,57 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "V�limuistihakemistoa ei voitu avata: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 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:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
@@ -6256,7 +6452,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -6289,28 +6485,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6318,89 +6514,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Paikalliset kansiot"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6413,77 +6611,82 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Virhe viestin %d kohdalla"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6498,29 +6701,33 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:265
+msgid "Mail append cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6529,146 +6736,154 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s ep�onnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "L�het� viesti kontaktille"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ei ole hakemisto."
@@ -6678,455 +6893,438 @@ msgstr "`%s' ei ole hakemisto."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Synkronoidaan kansiota"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "V�liaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "K�ytt�j�tunnuksen l�hetys palvelimelle ep�onnistui"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Ei saatu ryhm�luetteloa palvelimelta."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Keskusteluryhm�t"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Leikkaa valitut viestit"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Viestin hakeminen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viesti� %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "J�t� viestit palvelimelle"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(tuntematon)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Viestin l�hett�minen ep�onnistui: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "V�liaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7134,167 +7332,167 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoitetta ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 tavy"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u tavua"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
@@ -7326,52 +7524,52 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin l�hetet��n kopio viestist� (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7384,7 +7582,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7393,58 +7591,58 @@ msgstr ""
 "Tiedoston %s lukeminen ep�onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7453,7 +7651,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7462,7 +7660,7 @@ msgstr ""
 "Evolution on l�yt�nyt tallentamattomia tiedostoja edelliselt� \n"
 "istunnolta. Haluatko koittaa palauttaa niit�?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7472,38 +7670,47 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "V�litetty viesti"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr "Viestin kirjoitusikkunan luominen ep�onnistui."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7559,15 +7766,24 @@ msgstr "Nimi sis�lt��"
 msgid "Subject does not contain"
 msgstr "ei sis�ll�"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Muista t�m� salasana"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7626,30 +7842,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7781,22 +7997,22 @@ msgstr "Sitten"
 msgid "Add action"
 msgstr "Lis�� toiminto"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7811,39 +8027,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "S��nn�n nimi: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "l�htev�t"
 
@@ -8036,7 +8252,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "L�hett�j�"
 
@@ -8068,7 +8284,7 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Aihe"
@@ -8081,15 +8297,15 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "S��nn�t"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Lis�� s��nt�"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Muokkaa s��nt��"
 
@@ -8097,44 +8313,44 @@ msgstr "Muokkaa s��nt��"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "_Siirry kansioon..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "loppuu merkkijonoon"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "L�hetet��n \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8142,20 +8358,15 @@ msgstr ""
 "Evolution l�ysi Elmin s�hk�postitiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Kortti: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8163,23 +8374,23 @@ msgstr ""
 "Evolution l�ysi GnomeCardin tiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8187,11 +8398,11 @@ msgstr ""
 "Evolution l�ysi Netscapen s�hk�postitiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8199,7 +8410,7 @@ msgstr ""
 "Evolution l�ysi Pinen s�hk�postitiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Tulosta"
@@ -8236,247 +8447,252 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Poistettu"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Oletukset"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8499,33 +8715,42 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "sis�lt��"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr ""
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr ""
 
@@ -8543,16 +8768,16 @@ msgstr "Evolutionin uutismuokkain"
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Putken luonti ep�onnistui: %s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8562,7 +8787,7 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8578,53 +8803,53 @@ msgstr "�l� k�yt�"
 msgid "Enable"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "�l� poista"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_S�hk�postiasetukset..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Lis�� suodatuss��nt�"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8636,35 +8861,35 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestej�.\n"
 "Haluatko tehd� asetukset nyt?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "L�het� s�hk�postia"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8672,59 +8897,59 @@ msgstr ""
 "Viestill� ei ole aihetta.\n"
 "L�hetet��nk� toedella?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 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:617
+#: mail/mail-callbacks.c:599
 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:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8732,7 +8957,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8740,28 +8965,28 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, 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:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8769,31 +8994,31 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8835,17 +9060,17 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Tili"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8856,16 +9081,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "Saapuneet"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -8883,31 +9108,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Tilit"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8919,27 +9144,24 @@ msgid "Authentication"
 msgstr "Todennus"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Todennustapa:"
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Tarkastetaan onko uutta s�hk�postia"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Muokkain"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8949,333 +9171,363 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Luonnoskansio:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "K�_yt�"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "K�yt�"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Uutiset"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Valitse v�ri"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Muista t�m� salasana"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Otetaan vastaan s�hk�postia"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "L�htev� posti"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "L�hetetyt"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "L�hetettyjen kansio:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "L�hetettyjen kansio:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "P_alvelin vaati todennuksen"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "L�hde"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "L�hteen tiedot"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "L�hteet"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "K�yt� salattua yhteytt� (_SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Todennustapa:"
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "T_arkasta onko uutta postia joka"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "Tar_kista tuetut tavat"
+msgid "_Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "S�hk�postiosoit_e:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "Tyhj_enn� roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Korosta lainaukset v�rill�"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organisaatio:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Muista t�m� salasana"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "L�het� s�hk�postit oletuksena _HTML-muodossa."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Palvelintyyppi: "
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Allekirjoitu_stiedosto:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "K�ytt�j�t_unnus:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Joka"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "sekuntia."
 
@@ -9315,228 +9567,202 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "Salattua viesti� ei n�ytet�"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "Salattu viesti"
-
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "Napsauta kuvaketta salauksen purkamiseksi."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Muista t�m� salasana"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Salasana"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9544,153 +9770,148 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "L�hetet��n viesti� %d / %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Siirret��n"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Roskakori"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
@@ -9699,97 +9920,107 @@ msgstr "Hakuasetukset"
 msgid "_Search"
 msgstr "_Etsi"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Nimet�n viesti)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Nimet�n viesti"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Tyhj� viesti"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Hae viestist�"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkityst�"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Osumia:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tyyppi:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "L�het� & Vastaanota postia"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Peruuta"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "P�ivitet��n..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Salasana"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "V�litetty viesti - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Poistetaan kansiota %s"
@@ -9799,7 +10030,7 @@ msgstr "Poistetaan kansiota %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9808,29 +10039,29 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Kansio"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
@@ -9891,7 +10122,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -9917,26 +10148,26 @@ msgstr ""
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
@@ -9981,130 +10212,125 @@ msgstr "Poista tilaus"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nimi:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Yhteenveto sis�lt��"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:��</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "_Uusi kansio"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Ei teht�vi�"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 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:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "S��tiedot"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Alueet"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -10164,7 +10390,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10236,1061 +10462,1060 @@ msgstr ""
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
-msgstr ""
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
+msgstr "Lauantai"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Ensisijainen"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11300,8 +11525,9 @@ msgid " _Remove"
 msgstr "Poista"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
-msgstr ""
+#, fuzzy
+msgid "Add n_ews feed"
+msgstr "_Uusi kansio"
 
 #: my-evolution/my-evolution.glade.h:3
 msgid "Al_l stations:"
@@ -11316,13 +11542,13 @@ msgstr "Paikalliset kansiot"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "Kuinka monta p�iv�� kalenterissa n�ytet��n kerrallaan?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
-msgstr ""
+msgid "How many days should the calendar display at once?"
+msgstr "Kuinka monta p�iv�� kalenterissa n�ytet��n kerrallaan?"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
@@ -11368,12 +11594,12 @@ msgid "Show _today's tasks"
 msgstr "N�yt� t�m�np�iv�iset teht�v�t"
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "Teht�v�t "
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr ""
+msgid "Tasks "
+msgstr "Teht�v�t "
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
@@ -11393,14 +11619,14 @@ msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_Five days"
 msgstr "Viisi p�iv��"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_Mail"
@@ -11437,23 +11663,23 @@ msgstr "N�yt� yksityiskohdat"
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolutionin asennus"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11461,17 +11687,17 @@ msgstr ""
 "T�m�n Evolutionin uuden version t�ytyy asentaa uusia tiedostoja\n"
 "henkil�kohtaiseen Evolution-hakemistoosi"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Napsauta \"OK\" asentaaksesi tiedostot, tai \"Peruuta\" lopettaaksesi "
 "asennuksen."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11482,14 +11708,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11497,7 +11723,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11506,7 +11732,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11514,6 +11740,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11526,59 +11765,65 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Siir� kansio"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Poista"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Haluatko todella poistaa kansion '%s'?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nime� kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Nime� kansio '%s' uudelleen"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11586,52 +11831,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Vastaanottajia ei ole m��ritelty"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "V�limuistihakemistoa ei voitu avata: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Nimet�n)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11640,13 +11862,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11654,185 +11876,196 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "L�hett�j�:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Tuo"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Vastaanottajia ei ole m��ritelty"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "T�m� kansio ei voi sis�lt�� viestej�."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, 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:239
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
+msgid "About Ximian Evolution"
+msgstr "Tietoja Evolutionista..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
@@ -11840,46 +12073,36 @@ msgstr "Ty�skentele poissa linjoilta"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11887,212 +12110,312 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Ryhm�n nimi:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "�l� poista"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Nime� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Oikotieryhm�n uusi nimi:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "N�yt� oikotiet pienin� kuvakkeina"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "N�yt� oikotiet suurina kuvakkeina"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Uusi ryhm�..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Luo uusi oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Poista t�m� _ryhm�..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Poista t�m� oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Nime� t�m� ryhm� uudelleen..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Nime� t�m� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Nime� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Oikotien uusi nimi:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Avaa t�m�n oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avaa t�m�n oikotien osoittama kansio uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Nime� uudelleen"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Nime� t�m� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Poista"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista t�m� oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteit�."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, 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
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Ei nime�)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "I/O-virhe"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "M��rittelem�t�n"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "M��rittelem�t�n"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Tar_kista tuetut tavat"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+msgid "Unsupported operation"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "I/O-virhe"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "_Poistu"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Kalenteri"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Luonnoskansio:"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Ei viestej� valittuna"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Tuntematon virhe"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr ""
@@ -12192,74 +12515,69 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "�l� tuo"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Kiitos\n"
-"The Evolution Team\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Virhe avattaessa tiedostoa: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Avaa tiedosto"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Liit� tiedosto"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Vastaanottajia ei ole m��ritelty"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12351,7 +12669,7 @@ msgstr "Pys�yt� lataaminen"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "T_oiminnot"
@@ -12374,7 +12692,7 @@ msgid "_Forward Contact..."
 msgstr "_Kontaktit..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "T_ulosta..."
@@ -12424,7 +12742,7 @@ msgstr "_P�iv�"
 msgid "Delete the appointment"
 msgstr "Poista t�m� tapaaminen"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Siirry"
 
@@ -12558,11 +12876,12 @@ msgstr "Tulosta..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Tallenna"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -12579,7 +12898,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Tiedosto"
@@ -12601,7 +12920,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -12661,10 +12980,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Peruuta"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
@@ -12920,281 +13235,311 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "N�yt� seuraava t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "N�yt� seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "N�yt� seuraava lukematon s�ie"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "N�yt� edellinen t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "N�yt� edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "N�yt� edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Suodata postitus_listan mukaan..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Suodata _l�hett�j�n mukaan..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "V�lit�"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Liit� tekstitiedosto..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Lataa k_uvat"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Merkitse _t�rke�ksi"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit t�rkeiksi"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Siirr�"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Seuraava"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Seuraava t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Seuraava s�ie"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Seuraava lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenl�hett�mist� varten"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viesti�"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Edellinen t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Tulosta t�m� viesti"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "_Etsi viesti�"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "N�yt� t�ydet _otsikkotiedot"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "N�yt� viesti normaalimuodossa"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "_Luo viestist� suodatin"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "_V�litet� viesti"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "_Suuret kuvakkeet"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "_Siirr� kansioon"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "T_y�kalut"
@@ -13205,7 +13550,7 @@ msgstr "Sulje t�m� ikkuna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Sulje"
@@ -13236,11 +13581,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr ""
+#, fuzzy
+msgid "For_mat"
+msgstr "Tavallinen"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13288,7 +13635,7 @@ msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
@@ -13381,7 +13728,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Li_s��"
 
@@ -13397,7 +13744,7 @@ msgstr "_Vastausosoite-kentt�"
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -13640,10 +13987,6 @@ msgstr "_Oikotie"
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -13724,134 +14067,138 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Nykyinen n�kym�"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "T�n��n"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Korealainen"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "L�nsieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Perinteinen"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Yksinkertaistettu"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Uusi"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Muut..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "N�yt� kaikki"
 
@@ -13894,18 +14241,78 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS:n alustus ep�onnistui"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Tuntematon virhe"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Luottamuksellinen"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Kuvaus:"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Synkronoidaan kansiota"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %s: %s"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Kortti: "
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Salattua viesti� ei n�ytet�"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Salattu viesti"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Napsauta kuvaketta salauksen purkamiseksi."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#, fuzzy
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "V�limuistihakemistoa ei voitu avata: %s"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Kiitos\n"
+#~ "The Evolution Team\n"
+
 #~ msgid "LDAP Authentication"
 #~ msgstr "LDAP-Todennus"
 
@@ -13916,10 +14323,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Sent By:"
 #~ msgstr "L�hetetyt"
 
-#, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "Tiedoksi"
-
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
 #~ "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
@@ -14030,9 +14433,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "w"
 #~ msgstr "w"
 
-#~ msgid "x"
-#~ msgstr "x"
-
 #~ msgid "y"
 #~ msgstr "y"
 
@@ -14145,9 +14545,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Go to present time"
 #~ msgstr "Siirry nykyiseen aikaan"
 
-#~ msgid "Print calendar"
-#~ msgstr "Tulosta kalenteri"
-
 #~ msgid "W_ork Week"
 #~ msgstr "Ty�viikk_o"
 
@@ -14188,13 +14585,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Delegated From:"
 #~ msgstr "Poistettu"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "M��rittelem�t�n"
-
-#~ msgid "Task"
-#~ msgstr "Teht�v�"
-
 #~ msgid "Birthday"
 #~ msgstr "Syntym�p�iv�"
 
diff --git a/po/fr.po b/po/fr.po
index 0559b53d38..704b95ce57 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16.99\n"
-"POT-Creation-Date: 2001-10-23 20:06+0200\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-23 20:06+0200\n"
 "Last-Translator: Frederic Riss <frederic.riss@laposte.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -16,6 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Utilitaire pour importer des fichiers VCard dans Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importation fichiers VCard dans Evolution"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Utilitaire pour importer des fichiers VCard dans Evolution"
@@ -24,291 +34,296 @@ msgstr "Utilitaire pour importer des fichiers VCard dans Evolution"
 msgid "Imports VCard files into Evolution."
 msgstr "Importation fichiers VCard dans Evolution"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Classer comme :"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nom"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Prin."
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Adjoint"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Profession"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Prof."
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "R�pondeur"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Soci�t�"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Soc."
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobile"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax professionnel"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Fax prof."
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Prof. 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Fax Autre"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Service"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Serv"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Bur."
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Directeur"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Dir."
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Snom"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI du Calendrier"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CalURI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL Libre-Occup�"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "FBUrl"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Anniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Date de naissance"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Cat�gories"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Carte : "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -316,7 +331,7 @@ msgstr ""
 "\n"
 "Nom : "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -324,7 +339,7 @@ msgstr ""
 "\n"
 "  Pr�fixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -332,7 +347,7 @@ msgstr ""
 "\n"
 "  Donn� :      "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -340,7 +355,7 @@ msgstr ""
 "\n"
 "  Additionnel : "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -348,7 +363,7 @@ msgstr ""
 "\n"
 "  Famille :     "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -356,7 +371,7 @@ msgstr ""
 "\n"
 "  Suffixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -364,7 +379,7 @@ msgstr ""
 "\n"
 "Date de naissance : "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -372,7 +387,7 @@ msgstr ""
 "\n"
 "Adresse :"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -380,7 +395,7 @@ msgstr ""
 "\n"
 "  Bo�te postale :  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -388,7 +403,7 @@ msgstr ""
 "\n"
 "  Ext :         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -396,7 +411,7 @@ msgstr ""
 "\n"
 "  Rue :      "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -404,7 +419,7 @@ msgstr ""
 "\n"
 "  Ville :        "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -412,7 +427,7 @@ msgstr ""
 "\n"
 "  R�gion :      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -420,7 +435,7 @@ msgstr ""
 "\n"
 "  Code postal : "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -428,7 +443,7 @@ msgstr ""
 "\n"
 "  Pays :     "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -436,7 +451,7 @@ msgstr ""
 "\n"
 "Label de distribution : "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -444,7 +459,7 @@ msgstr ""
 "\n"
 "T�l�phones :\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -452,7 +467,7 @@ msgstr ""
 "\n"
 "T�l�phone :"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -460,7 +475,7 @@ msgstr ""
 "\n"
 "E-mail :\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -468,7 +483,7 @@ msgstr ""
 "\n"
 "E-mail 2 :"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -476,7 +491,7 @@ msgstr ""
 "\n"
 "Messager : "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -484,7 +499,7 @@ msgstr ""
 "\n"
 "Fuseau horaire : "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -492,7 +507,7 @@ msgstr ""
 "\n"
 "Situation g�ographique : "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -500,7 +515,7 @@ msgstr ""
 "\n"
 "Fonction : "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -508,7 +523,7 @@ msgstr ""
 "\n"
 "Org : "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -516,7 +531,7 @@ msgstr ""
 "\n"
 "  Nom :  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -524,7 +539,7 @@ msgstr ""
 "\n"
 "  Unit� :  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -532,7 +547,7 @@ msgstr ""
 "\n"
 "  Unit� 2 : "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -540,7 +555,7 @@ msgstr ""
 "\n"
 "  Unit� 3 : "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -548,7 +563,7 @@ msgstr ""
 "\n"
 "  Unit� 4 : "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -556,7 +571,7 @@ msgstr ""
 "\n"
 "Cat�gories : "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -574,7 +589,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -582,7 +597,7 @@ msgstr ""
 "\n"
 "Cha�ne unique : "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -590,11 +605,11 @@ msgstr ""
 "\n"
 "Cl� publique : "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Multiples VCards"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
@@ -603,16 +618,18 @@ 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:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1074
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Recherche..."
 
@@ -625,60 +642,60 @@ msgstr "Chargement"
 msgid "Error in search expression."
 msgstr "Erreur dans l'expression de recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Connexion au serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Impossible de se connecter au serveur LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Attente de la connexion au serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur lke serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "R�cup�ration des r�sultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Red�marrage de la recherche."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Le curseur ne peut �tre charg�\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook non charg�\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:645
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Ne peut d�marrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:646
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Ne peut d�marrer wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire les donn�es du bloc Adresses du Pilot"
 
@@ -722,39 +739,39 @@ msgstr "Usine � composants pour les popups d'adresse du carnet d'adresse"
 msgid "Factory for the sample Addressbook control"
 msgstr "Usine � composants pour l'exemple de composant Carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Dossier contenant les informations de contact"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "Serveur LDAP contenant les inforamtions des contacts"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Nouvelle liste de contacts"
 
@@ -787,7 +804,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Basique"
 
@@ -885,7 +902,7 @@ msgstr "_Ajouter"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_�diter"
@@ -902,15 +919,20 @@ msgstr "Port :"
 msgid "_Server name:"
 msgstr "Nom du serveur :"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Ne peut initialiser gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -919,7 +941,7 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses.\n"
 "Vous avez saisi un URI incorrect ou le serveur LDAP est stopp�"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -931,7 +953,7 @@ msgstr ""
 "devez compiler le programme � partir des sources CVS\n"
 "apr�s voir r�cup�r� OpenLDAP � l'adresse indiqu�e ci-dessous.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -939,42 +961,42 @@ msgstr ""
 "Nous n'avons pas pu ouvrir ce carnet d'adresse. V�rifiez que le\n"
 "chemin existe que que vous avez la permission d'acc�s S.V.P."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "L'email contient"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "La cat�gorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avanc�e..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Toute cat�gorie"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -987,51 +1009,51 @@ msgstr "L'URI que le navigateur de dossier affichera"
 msgid "(none)"
 msgstr "(Inconnu)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "E-mail principal"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "S�lectionner une action"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Cr�er un nouveau contact � %s �"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Ajouter une adresse au contact existant � %s �"
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Interroger le carnet d'adresses..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Editer Info Contact"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Ajouter aux contacts"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Fusionner l'adresse E-Mail"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "D�sactiver les interrogations"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activer les Interrogations (Dangereux!)"
 
@@ -1045,35 +1067,35 @@ msgstr ""
 "Usine � composants pour l'interface de s�lection de noms du carnet "
 "d'adresses d'Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Supprimer"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Supprimer tout"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Envoyer un courrier en HTML ?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Editer la liste de Contacts"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Liste de Contacts sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d cach�s)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
@@ -1094,7 +1116,15 @@ msgstr ""
 "des circonstances sous lesquelles cette erreur est survenue. \n"
 "Merci."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "S�lectionnez les contacts dans le carnet d'adresses"
 
@@ -1154,12 +1184,12 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "�diteur de contacts"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "D�tails"
 
@@ -1228,8 +1258,8 @@ msgstr "_Contacts..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1461 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1299,46 +1329,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient � ces cat�gories : "
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ne peut trouver un widget pour un champ :  � %s �"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "�diter enti�rement"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2407,7 +2437,7 @@ msgid "contact-list-editor"
 msgstr "�diteur de liste de contacts"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "�diteur de liste de contacts"
 
@@ -2456,13 +2486,13 @@ msgstr ""
 "Le nom ou l'adresse E-mail modifi�  de ce contact existe d�j�\n"
 "dans ce dossier. Voulez vous quand m�me l'ajouter ?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Recherche avanc�e"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Rechercher"
 
@@ -2481,9 +2511,9 @@ msgstr "%d cartes"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/widgets/e-addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
@@ -2494,18 +2524,18 @@ msgid "Open"
 msgstr "Ouvrir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:764
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:765
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2513,94 +2543,99 @@ msgid "Print"
 msgstr "Imprimer"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:767
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Imprimer En_veloppe..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:769 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 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:1875
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Permission refus�e"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Carte non trouv�e"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "L'ID de la carte existe d�j�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protocole non support�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:483 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Annul�e"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Autre Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Ajout liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Ajout carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Modification de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Suppression de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1307
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
 #. 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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2608,84 +2643,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "T�l�phone Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "T�l�phone Adjoint"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "T�l�phone Travail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "R�pondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "T�l�phone Soci�t�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "T�l�phone Maison"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Adresse Travail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adresse Maison"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "T�l�phone Mobile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "T�l�phone Voiture"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "T�l�phone Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "T�l�phone Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Autre T�l�phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Autre adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "et %d autres cartes."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "et une autre carte."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2871,95 +2906,110 @@ msgstr "Largeur :"
 msgid "_Font..."
 msgstr "_Police..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Imprimer les cartes"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Imprimer la carte"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "�diter le rendez-vous"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Haute"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Basse"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Ind�finie"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les donn�es du block Calendrier du Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:708
-#: calendar/conduits/todo/todo-conduit.c:711
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les donn�es du bloc � A faire � du Pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Un contr�le Bonobo qui affiche un calendrier."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Un contr�le Bonobo qui affiche un calendrier."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Composant � R�sum� du calendrier � du R�sum� d'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Afficheur Calendrier iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Composant pour le traitement du calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Utilitaire pour le composant R�sum� Calendrier."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Utilitaire pour le composant de messagerie d'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Utilitaire de contr�le de la vue iTip du Calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Utilitaire de contr�le du Calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Usine � composants pour centraliser les �diteurs de composants du calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Usine � composants pour cr�er les usines � �diteurs de composant"
 
@@ -2971,21 +3021,27 @@ 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:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "D�bute : "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Fini : "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Argument invalide"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Alarme d'Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:350
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme le %A %d %b %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarmes"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3004,11 +3060,11 @@ msgstr "Dur�e de la sieste (minutes)"
 msgid "_Edit appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:663
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:723
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3021,7 +3077,7 @@ msgstr ""
 "un courrier. Evolution affichera une fen�tre \n"
 "d'avertissement classique � la place."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:774
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3038,118 +3094,115 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Ne peut initialiser gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Impossible de cr�er le service de notification d'alarme"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de cr�er l'usine � services de notification d'alarme"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ne peut cr�er la vue du calendrier. Veuillez v�rifier la configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "_Public"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:460
-#: calendar/gui/e-meeting-time-sel.c:401 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Occup�"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Non d�marr�e"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Achev�e"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3160,54 +3213,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1448
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "R�currant"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Attribu�"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Non"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Recherche"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vue journali�re"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Vue hebdomadaire de travail"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Vue hebdomadaire"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Vue mensuelle"
 
@@ -3227,23 +3280,23 @@ msgstr "Le commentaire contient"
 msgid "Unmatched"
 msgstr "Diff�rent"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/component-factory.c:65
+#: 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:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:241 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "T�ches"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Dossier contenant des �l�ments � � Faire �"
 
@@ -3251,7 +3304,7 @@ msgstr "Dossier contenant des �l�ments � � Faire �"
 msgid "Create a new appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
@@ -3264,7 +3317,7 @@ msgstr "Cr�e une nouvelle t�che"
 msgid "New _Task"
 msgstr "Nouvelle _t�che"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
@@ -3337,115 +3390,110 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr " %d jours"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr " 1 jour"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr " %d semaines"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr " 1 semaine"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr " %d heures"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr " 1 heure"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr " %d minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr " 1 minute"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr " %d secondes"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:371
+#: 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:375
+#: 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:379
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Envoyer un E-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: 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:389
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Action inconnue � ex�cuter"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s avant le d�but du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s apr�s le d�but du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s au d�but du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:418
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s avant la fin du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s apr�s la fin du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:426
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s � la fin du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at an unknown time"
-msgstr "%s � un moment inconnu"
-
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s � %s"
 
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
@@ -3466,7 +3514,7 @@ msgstr "Rappels"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:683 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "R�sum� :"
 
@@ -3549,7 +3597,7 @@ msgid "First day of wee_k:"
 msgstr "_Premier jour de la semaine :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -3562,7 +3610,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Lundi"
 
@@ -3571,7 +3619,7 @@ msgid "O_verdue tasks:"
 msgstr "T�ches en _retard :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -3592,7 +3640,7 @@ msgid "Su_n"
 msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -3609,7 +3657,7 @@ msgid "Tas_ks due today:"
 msgstr "_T�ches d'aujourd'hui :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -3630,12 +3678,12 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Mardi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -3704,119 +3752,124 @@ msgstr "M_er"
 msgid "before the start of the appointment"
 msgstr "Avant le d�but du  rendez-vous"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "L'�tat de la r�union a chang�. Envoyer une version corrig�e ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�tes-vous s�r de vouloir annuler et supprimer cette r�union ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�tes-vous s�r de vouloir annuler et supprimer cette t�che ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�tes-vous s�r de vouloir annuler et supprimer l'entr�e de journal ?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Cet �v�nement a �t� supprim�."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Cette t�che a �t� supprim�e."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Cette entr�e du journal a �t� supprim�e."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Vous avez fait des modifications. Oublier ces changements et fermer "
 "l'�diteur ?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Vous n'avez fait aucune modification. Fermer l'�diteur ?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Cet �v�nement a �t� modifi�."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Cette t�che a �t� modifi�e."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Cette entr�e du journal a �t� modifi�e."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vous avez fait des modifications.Oublier ces modifications et mettre � "
 "jour l'�diteur"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " � "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Termin�"
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Termin�"
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr "(Date d'�ch�ance"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Date d'�ch�ance"
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Ne peut mettre � jour les fichiers correctement"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "T�che - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entr�e de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Aucun r�sum�"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1812
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "�craser le fichier ?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1819
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3825,53 +3878,53 @@ msgstr ""
 "Un fichier ayant le m�me nom existe.\n"
 "L'�craser ?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "R�cup�ration de la version courante impossible !"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, 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 ?"
@@ -3888,25 +3941,25 @@ msgstr "D�l�gu� � :"
 msgid "Enter Delegate"
 msgstr "Saisissez un d�l�gu�"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Rappeler"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "R�currence"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Programme"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "R�union"
 
@@ -3925,11 +3978,12 @@ msgid "Classification"
 msgstr "Classification"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Con_fidentiel"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Date & heure"
 
@@ -3938,12 +3992,12 @@ msgid "F_ree"
 msgstr "_Libre"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_v�"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
@@ -3953,7 +4007,7 @@ msgid "Show Time As"
 msgstr "Afficher l'heure comme"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "R�su_m� :"
 
@@ -3965,15 +4019,20 @@ msgstr "Heure de _fin :"
 msgid "_Start time:"
 msgstr "Heure de _d�but :"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Un organisateur est n�cessaire"
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Au moins un participant est n�cessaire"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Cette personne assiste d�j� � la r�union !"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_D�l�gu� �..."
 
@@ -4013,6 +4072,7 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "R�ponse S.V.P"
@@ -4046,34 +4106,35 @@ msgid "_Change Organizer"
 msgstr "_Changer l'organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Inviter d'autres personnes"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Inviter d'autres personnes..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Autre organizer"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des r�currences qu'Evolution ne peut �diter."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "i�me"
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "r�currences"
 
@@ -4137,21 +4198,17 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "ann�e(s)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Voulez-vous enregistrer les modifications ?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la r�union ont chang�.Envoyer une version mise � jour ?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la t�che ont chang�.Envoyer une version mise � jour ?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "L'entr�e du journal a chang�.Envoyer une version mise � jour ?"
 
@@ -4170,7 +4227,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL :"
 
@@ -4182,145 +4239,153 @@ msgstr "_Priorit� :"
 msgid "_Status:"
 msgstr "_�tat :"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "T�che"
 
-#: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Description :"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Date de _d�but :"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "Con_fidentiel"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Date d'_�ch�ance :"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:936 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1440
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Supprimer les contacts s�lectionn�s"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:940 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:942 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:944 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:949
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "Marquer comme termin�"
 
-#: calendar/gui/e-calendar-table.c:951
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "Supprimer cette t�che"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "Marquer les t�ches comme termin�es"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les t�ches s�lectionn�es"
 
-#: calendar/gui/e-calendar-table.c:1216
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une t�che"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:131 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:134 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:139
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4336,7 +4401,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Termin�"
 
@@ -4367,8 +4432,8 @@ msgstr "Date de d�but"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "R�sum�"
 
@@ -4380,113 +4445,118 @@ msgstr "Tri par t�che"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nouvel �v�nement de journ�e compl�te"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Aller � aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "Aller � la date"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence d�pla�able"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:473
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "La r�union commence : <b>"
 
-#: calendar/gui/e-itip-control.c:478
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "La t�che commence : <b>"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "L'information Libre/Occup� commence : <b>"
 
-#: calendar/gui/e-itip-control.c:487
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "D�bute : <b>"
 
-#: calendar/gui/e-itip-control.c:500
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "La r�union se termine : <b>"
 
-#: calendar/gui/e-itip-control.c:503
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "l'information Libre/Occup� se termine : <b>"
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Finit : <b>"
 
-#: calendar/gui/e-itip-control.c:519
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "T�che achev�e : <b>"
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "T�che escompt�e : "
 
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Information calendrier"
+
 #. Title
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:644 calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4495,223 +4565,275 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:683
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "S�lectionner une action"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Mise � jour de t�che"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Accept�"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Essai"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Refus�"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Information Libre-Occup�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informations de la t�che"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annuler"
+
+#: calendar/gui/e-itip-control.c:867
 #, 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:726
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Informations de la r�union"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:872
 #, 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:731
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Proposition de r�union"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:877
 #, 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:736
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Mise � jour de la r�union"
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:882
 #, 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:741
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Demande de mise � jour de la r�union"
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:887
 #, 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:746
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "R�ponse � une r�union"
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:892
 #, 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:751
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Annulation de r�union"
 
-#: calendar/gui/e-itip-control.c:755 calendar/gui/e-itip-control.c:803
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, 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:756
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de r�union"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:917
 #, 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:774
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Informations de la t�che"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:922
 #, 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:779
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "T�che propos�e"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:927
 #, 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:784
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Mise � jour de t�che"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:932
 #, 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:789
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Demande de mise � jour de t�che"
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a r�pondu � une assignation de t�che."
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "R�pondre � la t�che"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:942
 #, 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:799
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Annulation de t�che"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Mauvais message de t�che"
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:967
 #, 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:822
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:972
 #, 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:827
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> a r�pondu � une demande Libre/Occup�"
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "R�ponse Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:1052
 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:924
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requ�tes non-support�es."
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "L'attachement ne contient pas d'information de calendrier valide"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "L'attachement ne contient pas d'information de calendrier visualisable"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Le fichier de calendrier n'a pas pu �tre mis � jour !\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Mise � jour termin�e\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le status du participant n'a pas pu �tre mis � jour � cause d'un status "
 "invalide !\n"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Le status du participant n'a pas pu �tre mis � jour !\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis � jour\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le status du participant ne peut �tre mis � jour car l'entr�e n'existe plus"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 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:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Effacement Termin�"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Item envoy� !\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu �tre envoy� !\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 "Impossible de trouver l'une de vos identit�s dans la liste des "
@@ -4754,216 +4876,211 @@ msgstr "date de fin"
 msgid "date-start"
 msgstr "date de d�but"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Pr�sidents"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Participants demand�s"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Participants optionnels"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Non participants"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Groupe"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Salle"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:691
-#: calendar/gui/e-meeting-model.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Pr�sident"
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521 calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Participant exig�"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529 calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "N�cessite une action"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Accept�"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Refus�"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:735 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
-#: calendar/gui/e-meeting-model.c:736
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "D�l�gu�"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "En cours"
 
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1465
-msgid "Chair Persons"
-msgstr "Pr�sidents"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1420
-#: calendar/gui/e-meeting-model.c:1467
-msgid "Required Participants"
-msgstr "Participants demand�s"
-
-#: calendar/gui/e-meeting-model.c:1354 calendar/gui/e-meeting-model.c:1469
-msgid "Optional Participants"
-msgstr "Participants optionnels"
-
-#: calendar/gui/e-meeting-model.c:1355 calendar/gui/e-meeting-model.c:1471
-msgid "Non-Participants"
-msgstr "Non participants"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:402
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "_Invite Others..."
-msgstr "_Inviter d'autres personnes..."
-
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Options"
 
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Afficher _Zoom� arri�re"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Mettre � jour Libre/Occup�"
 
-#: calendar/gui/e-meeting-time-sel.c:505
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Personnes _n�cessaires"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Personnes n�cessaires et _une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Heure de _d�but de la r�union :"
 
-#: calendar/gui/e-meeting-time-sel.c:634
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la r�union :"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des t�ches � %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger les t�ches dans � %s �"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La m�thode requise pour charger � %s � n'est pas support�e"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier � %s"
@@ -5024,230 +5141,274 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Au moins un participant est n�cessaire"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Un organizer doit �tre configur�"
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Vous devez �tre inscrit comme participant � l'�v�nement."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Impossible de cr�er l'usine � �diteurs de composants"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20�me"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21�me"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22�me"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23�me"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24�me"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25�me"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26�me"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27�me"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28�me"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29�me"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30�me"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31�me"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour s�lectionn� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semaine s�lectionn�e (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Mois s�lectionn� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Ann�e s�lectionn�e (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "T�che"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_�tat :"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorit� :"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Pourcentage termin�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL :"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Cat�gories : "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Contacts :"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2241 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Aper�u Avant Impression"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Imprime cet �l�ment"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Les URI du dossier des t�ches � afficher"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Ne peut cr�er la vue du calendrier. Veuillez v�rifier la configuration "
+"d'ORBit et d'OAF."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5255,7 +5416,7 @@ msgstr ""
 "Evolution a pris les t�ches qui �taient dans votre dossier calendrier\n"
 "et les a automatiquement d�plac�es dans le nouveau dossier de t�ches."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5267,7 +5428,7 @@ msgstr ""
 "et les a automatiquement d�plac�es dans le nouveau dossier de t�ches.\n"
 "Quelques unes n'ont pas pu �tre import�es, ce process essaiera � nouveau."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5276,7 +5437,7 @@ msgstr ""
 "Ne peut ouvrir `%s'; aucun item du dossier calendrier n'a pu �tre d�plac� "
 "dans le dossier des t�ches."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5285,94 +5446,94 @@ msgstr ""
 "La m�thode demand�e pour charger `%s' n'est pas support�e; aucun item du "
 "dossier calendrier ne sera d�plac� vers le dossier des t�ches."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now attend 0 argument"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time attend 1 argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time attend une cha�ne de caract�res pour l'argument 1"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time attend une cha�ne de date ISO 8601 pour l'argument 1"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add attend 2 arguments"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add attend un entier pour l'argument 2"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin attend 1 argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time_day-end attend 1 argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype attend 0 argument"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "Occur-in-time-range ? attend 2 arguments"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 2"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains ? attend 2 arguments"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains ? attend une cha�ne pour l'argument 1"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains ? attend une cha�ne pour l'argument 2"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains ? attend � any �, � summary �, � description � pour l'argument 1"
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories ? attend au moins 1 argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5380,19 +5541,19 @@ msgstr ""
 "has-categories ? attend tous les arguments comme cha�ne ou seulement 1 "
 "argument comme bool�en faux (#f)"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed ? attend 0 argument"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before. attend 1 argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? attends un t_time comme premier argument"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "L'�valuation de l'expression de recherche ne produit pas un bool�en"
 
@@ -5416,7 +5577,7 @@ msgstr "Le codage n'est pas support� par ce message chiffr�"
 msgid "Decryption is not supported by this cipher"
 msgstr "Le d�codage n'est pas support� par ce message chiffr�"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5427,7 +5588,7 @@ msgstr ""
 "Des informations de ce serveur ne seront pas rejou�es\n"
 "quand vous vous reconnecterez au r�seau."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5438,15 +5599,15 @@ msgstr ""
 "%s\n"
 "Les modifications apport�es � ce dossier ne seront pas resynchronis�es."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resynchronisation avec le serveur"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 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:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
@@ -5472,26 +5633,26 @@ msgstr "Anomalie message %d"
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "R�sup�ration du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur ex�cution du filtre : %s : %s"
@@ -5501,26 +5662,26 @@ msgstr "Erreur ex�cution du filtre : %s : %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtr�e : %s : %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Action non support�e : Ajout du message : pour %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Op�ration non-support�e : recherche par expression : pour %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Op�ration non-support�e : recherche par uids : pour %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "D�placement des messages"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5529,7 +5690,7 @@ msgstr ""
 "Ne peut pas analyser  l'expression de recherche : %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5538,113 +5699,113 @@ msgstr ""
 "Erreur lors de l'ex�cution de l'expression de recherche : %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(compare tout) demande un unique r�sultat bool�en"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur ent�te inconnue : %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Type inconnu dans le corps, attend une cha�ne"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Ne peut cr�er le tube de l'aide de verrouillage : %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ne peut � forker � l'aide de verrouillage : %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Ne peut verrouiller '%s' : erreur de protocole avec l'aide de verrouillage"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ne peut verrouiller '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ne peut cr�er le fichier de verrouillage pour %s : %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "�ch�ance du d�lai pour obtenir le fichier de verrouillage sur %s. Essayez de "
 "nouveau plus tard."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Ne peut v�rifier le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "�chec du stockage du courrier dans le fichier temporaire %s : %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ne peut cr�er le tube : %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ne peut cloner : %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "�chec du programme Movemail : %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erreur de lecture du fichier de courrier : %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erreur d'�criture du fichier temporaire de courrier : %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur d'�criture du fichier temporaire de courrier : %s"
@@ -5659,87 +5820,87 @@ msgstr "Veuillez saisir votre phrase de passe %s pour %s"
 msgid "Please enter your %s passphrase"
 msgstr "Veuillez saisir votre phrase de passe pour %s"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Impossible de signer ce message : pas de partie plaintext � signer"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Impossible de signer ce message : pas de mot de passe fourni"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Impossible de signer ce message : ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Impossible de signer ce message : pas de partie plaintext � signer"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Impossible de v�rifier ce message : pas de partie plaintext � v�rifier"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Impossible de v�rifier ce message : ne peut pas cr�er le tube vers GPG/PGP : "
 "%s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Impossible de v�rifier ce message : ne peut cr�er de fichier temporaire : %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Impossible de crypter ce message : pas de partie plaintext � crypter"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Impossible de crypter ce message : pas de mot de passe fourni"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Impossible de crypter ce message : ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Impossible de crypter ce message : aucun d�stinataire n'est sp�cifi�"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "Impossible de d�crypter ce message : pas de partie cyphertext � d�crypter"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Impossible de d�crypter ce message : pas de mot de passe sp�cifi�"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Impossible de d�crypter ce message : ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Ne peut charger %s : Le chargement du module n'est pas support� sur ce "
 "syst�me."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne peut charger %s : %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
@@ -5759,7 +5920,7 @@ msgid "Connection cancelled"
 msgstr "Connexion annul�e"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter � %s (port %d) : %s"
@@ -5769,12 +5930,12 @@ msgid "(unknown host)"
 msgstr "(H�te inconnu)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Op�ration annul�e"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur d�connect� de mani�re inattendue : %s"
@@ -5888,7 +6049,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
@@ -5906,8 +6067,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -5936,56 +6097,56 @@ msgstr "POP avant authentification SMTP utilisant une source non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "�chec de compilation d'expression r�guli�re : %s : %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: 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:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "R�solution de : %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "�chec de la r�solution du nom : %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, 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:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�chec de la r�solution de l'h�te : %s : raison inconnue"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Founisseur de dossier de courrier virtuel"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture du courrier comme requ�te sur un autre ensemble de dossiers"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole � %s �"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6031,15 +6192,15 @@ msgstr "�chec de d�codage du message."
 msgid "Failed to verify certificates."
 msgstr "�chec de v�rification des certificats."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossible d'obtenir le dossier : Op�ration invalide sur ce stockage"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de cr�er le dossier : Op�ration invalide sur ce stockage"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6049,7 +6210,7 @@ msgstr ""
 "Sujet : %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6064,7 +6225,7 @@ msgstr ""
 "\n"
 "D�sirez-vous accepter quand m�me ?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6083,37 +6244,37 @@ msgstr ""
 "�tat : %s\n"
 "Pays : %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne peut analyser l'URL � %s �"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant : %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : Op�ration invalide"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : Dossier in�xistant"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : Op�ration invalide"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
@@ -6146,52 +6307,52 @@ msgstr "La r�ponse du serveur IMAP ne contient pas l'information %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�ponse OK inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut cr�er le r�pertoire %s : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne peut charger le r�sum� pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a �t� d�truit et recr�� sur le serveur"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifi�s"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Recherche des informations de r�sum� pour des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Examen des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la r�ponse FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Ne peut ouvrir le r�pertoire de cache : %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
@@ -6204,7 +6365,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -6238,29 +6399,29 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le m�canisme d'authetification de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Pas de support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6271,93 +6432,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier � %s �."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autoris� � contenir des sous-dossiers"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Rp�ertoires de courrier au format MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pour stocker le courrier local dans des r�pertoires de type MH."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 "Pour r�cup�rer le courrier local dans des bo�tes aux lettres au format "
 "standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 "Appliquer les filtres aux nouveaux messages dans la bo�te de r�ception."
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "R�pertoires de courrier au format Maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr ""
 "Pour stocker le courrier local dans des r�pertoires de courrier au format "
 "Maildir"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Bo�te aux lettres format mbox (standard Unix)"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Pour stocker le courrier local dans des fichiers au format mbox"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas de bo�te de r�ception"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier � %s � : %s"
@@ -6368,27 +6531,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "Impossible de sauvegarder le r�sum� : %s : %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au r�sum� : raison inconnue"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Ajout du message annul�"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossible de joindre le message au dossier maildir : %s : %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6397,20 +6560,20 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Contenu de message invalide"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6419,15 +6582,15 @@ msgstr ""
 "Ne peut ouvrir le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier � %s � n'existe pas."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6436,19 +6599,19 @@ msgstr ""
 "Ne peut cr�er le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "� %s � n'est pas un r�pertoire maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossible de supprimer le dossier � %s � : %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "n'est pas un r�pertoire maildir"
 
@@ -6463,33 +6626,33 @@ msgstr "Impossible de scruter le dossier � %s � : %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Impossible d'ouvrir le r�petoire maildir : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossible de cr�er le verrou sur le dossier %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Ajout de courrier annul�"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de joindre le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6498,17 +6661,17 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irr�m�diablement corrompu"
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erreur construction message : Bo�te � lettre corrompue ?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6517,7 +6680,7 @@ msgstr ""
 "Impossible d'ouvrir le fichier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6526,14 +6689,14 @@ msgstr ""
 "Ne peut cr�er le fichier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "� %s � n'est pas un fichier normal."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6542,113 +6705,113 @@ msgstr ""
 "Ne peut supprimer le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier � %s � n'est pas vide. Non supprim�."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Ecriture du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossible d'ouvrir le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erreur fatale d'analyse du courrier pr�s de la position %ld dans le dossier %"
 "s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de v�rifier le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la bo�te � lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le r�sum� et le dossier ne correspondent pas, m�me apr�s une synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erreur d'�criture dans la boite � lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�chec d'�criture dans la boite � lettres temporaire : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Ajout de message au dossier (format MH) annul�"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de joindre le message au dossier mh : %s : %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "� %s � n'est pas un r�pertoire."
@@ -6658,49 +6821,49 @@ msgstr "� %s � n'est pas un r�pertoire."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne peut ouvrir le r�peroire format MH : %s : %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Impossible d'ajouter le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Le dossier � %s/%s � n'existe pas."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent �tre renomm�s."
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent �tre effac�s."
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de courrier temporaire %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de spool %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6709,70 +6872,70 @@ msgstr ""
 "Ne peut synchroniser le dossier de spool %s : %s\n"
 "Le dossier est peut-�tre corrompu, copie enregistr�e dans '%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Veuillez saisir le mot de passe NNTP pour %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Le serveur a rejet� le nom d'utilisateur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "�chec d'envoi du nom d'utilisateur au serveur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejet� le nom d'utilisateur/mot de passe"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Message %s non trouv�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Ne peut obtenir la liste des grouges du serveur."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Impossible de charger la liste des groupes du serveur pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 "Impossible de sauvegarder le fichier de la liste des groupes pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nouvelles USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "C'est un fournisseur pour la lecture et la publication dans les groupes de "
 "nouvelles USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Ne peut ouvrir le r�pertoire pour le serveur de nouvelles : %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6780,72 +6943,72 @@ msgstr ""
 "Cette option vous identifiera aupr�s du serveur NNTP en utilisant un mot de "
 "passe en clair."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapable d'ouvrir ou de cr�er un fichier .newsrc pour %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "R�cup�ration r�sum� POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Nettoyer les messages supprim�s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Impossible de r�cup�rer le message : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "R�cup�ration du message POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Sauvegarde des messages"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Ne pas effacer les messages du serveur"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Pour se connecter et t�l�charger son courrier depuis des serveurs POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6853,7 +7016,7 @@ msgstr ""
 "Cette option vous connectera au serveur POP en utilisant un mot de passe en "
 "clair. C'est la seule option support�e par la plupart des serveurs POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6863,34 +7026,34 @@ msgstr ""
 "chiffr� via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs m�me si le serveur pr�tend pouvoir le supporter."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Ne peut vous identifier sur le serveur KPOP : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Ne peut se connecter au serveur sur %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Ne peut se connecter au serveur POP sur %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6899,12 +7062,12 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du nom d'utilisateur : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6912,7 +7075,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le m�canisme d'identification demand�."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6921,22 +7084,22 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier � %s �."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "R�ponse inattendue du serveur POP : %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6944,174 +7107,174 @@ msgstr ""
 "Pour d�livrer le courrier en passant par le programme � sendmail � sur le "
 "syst�me local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ne peut cr�er de tube vers sendmail : %s : courrier non envoy�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ne peut cloner sendmail : %s : courrier non envoy�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail s'est termin� avec le signal %s : courrier non envoy�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail s'est terrmin� avec l'�tat %d : courrier non envoy�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Ne peut trouver l'adresse �From� dans le message"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Pour livrer le courrier en vous connectant � un distributeur distant "
 "utilisant SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Erreur de syntaxe, commande non reconnue"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Erreur de syntaxe dans les param�tres ou les arguments"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Commande non impl�ment�e"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Param�tre non impl�ment�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Statut syst�me, ou r�ponse � une aide syst�me"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Service pr�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Service de fermeture du canal de transmission"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Service non disponible, fermeture du canal de transmission"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Action courrier demand�e OK, termin�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilisateur non local; transf�rera � <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Action courrier demand�e non prise : bo�te � lettres indisponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Action demand�e non prise : bo�te � lettres indisponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Action demand�e abandonn�e : erreur traitement"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Utilisateur non local; essayez <forward-path> S.V.P"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Action demand�e non prise : syst�me de stockage insuffisant"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Action courrier demand�e abandonn�e : allocation de stockage excessif"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Action demand�e non prise : nom de bo�te � lettres non autoris�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "D�marre entr�e courrier; fin avec <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "�chec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fourni"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Le m�canisme d'authentification est trop fragile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryptage n�cessaire pour  le m�canisme d'identification demand�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Anomalie authentification temporaire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenue : %s : s�rement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Le serveur SMTP %s ne supporte pas le type d'identification demand� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7122,128 +7285,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas d�finie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas valide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Demande HELO d�pass�e : %s non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erreur r�ponse HELO : %s non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Erreur cr�ation objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expir�e : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise r�ponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Demande MAIL FROM d�pass�e : %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erreur r�ponse MAIL FROM : %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Demande RCPT TO expir�e : %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erreur r�ponse RCPT TO : %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expir�e : %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erreur r�ponse DATA : %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Envoi DATA expir� : Arr�t du message : %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Erreur r�ponse DATA : s'est termin� avec le signal %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET d�pass�e : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erreur r�ponse RSET : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "R�ponse QUIT d�pass�e : %s / non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erreur r�ponse QUIT : %s : non fatal"
@@ -7376,7 +7539,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7385,29 +7548,29 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Avertissement !"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'�craser ?"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7415,16 +7578,16 @@ msgstr ""
 "Impossible d'ouvrir le dossier brouillons pour ce compte.\n"
 "Voulez-vous utiliser le dossier brouillons g�n�rique ?"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur acc�s au fichier : %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut r�cup�rer le message de l'�diteur"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7433,7 +7596,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7442,7 +7605,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7451,7 +7614,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7459,7 +7622,7 @@ msgstr ""
 "Evolution a trouv� des fichiers non sauvegard�s d'une session pr�c�dente.\n"
 "Voulez-vous essayer de les r�cup�rer ?"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7469,23 +7632,23 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifi�"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Ins�rer un fichier"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7493,7 +7656,7 @@ msgstr ""
 "Impossible de cr�er la fen�te de composition:\n"
 "Impossible d'activer le composant de s�lection d'adresse."
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7501,7 +7664,7 @@ msgstr ""
 "Impossible de cr�er la fen�tre de composition :\n"
 "Ne peut activer le composant � Editeur HTML �."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7509,11 +7672,11 @@ msgstr ""
 "Ne peut cr�er une fen�tre de composition de message parce que vous \n"
 "n'avez pas encore configur� d'identit�s dans le composant courrier."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7561,15 +7724,24 @@ msgstr "Le sujet contient"
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Se souvenir du mot de passe"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7620,30 +7792,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7778,7 +7950,7 @@ msgstr "Alors"
 msgid "Add action"
 msgstr "Ajouter l'action"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7787,16 +7959,16 @@ msgstr ""
 "Revenez en arri�re et sp�cifiez un dossier valide pour\n"
 "y d�livrer du courrier."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
-#: mail/mail-account-gui.c:824
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "S�lectionnez un Dossier"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Saisissez l'URI du dossier"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour s�lectionner un dossier>"
 
@@ -7813,39 +7985,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nom de la r�gle : "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Ex�cuter les actions"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "si tous les crit�res sont remplis"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "si un des crit�res est rempli"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Ajouter un crit�re"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "entrant"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "sortant"
 
@@ -8038,7 +8210,7 @@ msgstr "R�pondu �"
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1351
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Exp�diteur"
 
@@ -8070,7 +8242,7 @@ msgstr "D�bute par"
 msgid "Stop Processing"
 msgstr "Arr�te le traitement"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Sujet"
@@ -8083,15 +8255,15 @@ msgstr "�tait apr�s"
 msgid "was before"
 msgstr "�tait avant"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "R�gles"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Ajouter une r�gle"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "�diter la r�gle"
 
@@ -8099,42 +8271,42 @@ msgstr "�diter la r�gle"
 msgid "Score Rules"
 msgstr "R�gles des scores"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Vous devez sp�cifier au moins un dossier comme source."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importation"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Attendez S.V.P"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importation de %s comme %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:93
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Courrier"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8142,19 +8314,15 @@ msgstr ""
 "Evolution a trouv� des fichiers courrier Elm\n"
 "Voulez-vous les importer dans Evoltion ?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard : "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8162,23 +8330,23 @@ msgstr ""
 "Evolution a trouv� des fichiers GnomeCard.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes donn�es Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scrutation du r�pertoire"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "D�but importation :"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "_R�glages"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8186,11 +8354,11 @@ msgstr ""
 "Evolution a trouv� des fichiers courrier Netscape.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importe d'ancienne donn�es Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8198,7 +8366,7 @@ msgstr ""
 "Evolution a trouv� des fichiers courrier Pine\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8234,40 +8402,40 @@ msgstr "Utilitaire pour le composant de r�sum� de messagerie."
 msgid "Mail configuration interface"
 msgstr "Interface de configuration de la messagerie"
 
-#: mail/component-factory.c:93
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Dossier contenant du courrier"
 
-#: mail/component-factory.c:94
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Dossier de stockage de courrier (interne)"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Corbeille Virtuelle"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Dossier de corbeille Virtuelle"
 
-#: mail/component-factory.c:122
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Impossible de se connecter au stockage : %s"
 
-#: mail/component-factory.c:140
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Ce dossier ne peut contenir de messages."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "_Propri�t�s..."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Modifier les propri�t�s de ce dossier"
 
-#: mail/component-factory.c:726
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8275,203 +8443,208 @@ msgstr ""
 "Certains de vos r�glages de messagerie semblent corrompus, v�rifiez que tout "
 "est en ordre."
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nouveau message �lectronique"
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nouveau _Message �lectronique"
 
-#: mail/component-factory.c:910
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Ne peut initialiser le composant de configuration de messagerie d'Evolution."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Impossible d'initialiser le composant d'information des dossiers d'Evolution"
 
-#: mail/component-factory.c:1090
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:270
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propri�t�s de � %s �"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:287 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nouveaux"
 
-#: mail/folder-browser.c:762 mail/folder-browser.c:767
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d cach�s"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d s�lectionn�s"
 
-#: mail/folder-browser.c:791
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d non envoy�s"
 
-#: mail/folder-browser.c:793
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d envoy�s"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1042
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Cr�er un dossier virtuel � partir de la recherche"
 
-#: mail/folder-browser.c:1423
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1424
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: mail/folder-browser.c:1425
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1426
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'exp�diteur"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1441 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1442 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1447 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "R�pondre � l'exp�diteur"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "R�pondre � la _liste"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "R�pondre � _tous"
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_D�placer vers le dossier..."
 
-#: mail/folder-browser.c:1460
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_R�cup�rer"
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Ajouter l'exp�diteur au carnet d'adresses"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: mail/folder-browser.c:1621
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Dossier virtuel sur la liste de diffusion (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "D�_faut"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "R�cup�ration des informations dossier"
@@ -8549,15 +8722,15 @@ msgstr "Editeur de News d'Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:949
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr "Impossible de sauvegarder le fichier de signature."
 
-#: mail/mail-account-gui.c:1026
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-account-gui.c:1032
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8567,7 +8740,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-account-gui.c:1617
+#: mail/mail-account-gui.c:1651
 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."
 
@@ -8583,52 +8756,52 @@ msgstr "D�sactiver."
 msgid "Enable"
 msgstr "Activer"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "�tes-vous s�r de vouloir supprimer ce compte ?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "De pas supprimer"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Effacer r�ellement le compte ?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Param�trage Messagerie..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Courrier � %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Sujet est %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Ajouter une R�gle de Filtre"
 
-#: mail/mail-callbacks.c:140
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8640,7 +8813,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8648,7 +8821,7 @@ msgstr ""
 "Vous devez configurer une identit�\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:207
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8656,12 +8829,12 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas d�fini de m�thode de transport de courrier"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8669,11 +8842,11 @@ msgstr ""
 "Vous �tes sur le point d'envoyer un courrier au format HTML, mais les "
 "d�stinataires suivants ne veulent pas de ce format :\n"
 
-#: mail/mail-callbacks.c:285
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Envoyer tout de m�me ?"
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8681,7 +8854,7 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8689,11 +8862,11 @@ msgstr ""
 "Depuis que la liste de contacts que vous envoyez est configur�e pour cacher "
 "la liste d'adresses, ce message contiendra seulement des destinataires Bcc."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: mail/mail-callbacks.c:379
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8703,41 +8876,41 @@ msgstr ""
 "en ajoutant un ent�te Apparently-To.\n"
 "Envoyer quand m�me ?"
 
-#: mail/mail-callbacks.c:473
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Le message contient des destinataires non valides :"
 
-#: mail/mail-callbacks.c:508
+#: mail/mail-callbacks.c:503
 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:604
+#: mail/mail-callbacks.c:599
 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:840
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "Un exp�diteur inconnu"
 
-#: mail/mail-callbacks.c:845
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "le %a %d-%m-%Y � %H:%M,  %%s a �crit :"
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1680
+#: mail/mail-callbacks.c:1732
 #, 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:1702
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8745,7 +8918,7 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1738
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8753,28 +8926,28 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoy�s."
 
-#: mail/mail-callbacks.c:1752
+#: mail/mail-callbacks.c:1810
 #, 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:1775
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Aucun message s�lectionn�"
 
-#: mail/mail-callbacks.c:1863
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1865
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2010 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: mail/mail-callbacks.c:2017
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8786,11 +8959,11 @@ msgstr ""
 "\n"
 "Effacer r�ellement ces messages ?"
 
-#: mail/mail-callbacks.c:2024
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8799,19 +8972,19 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "_Filtres"
 
-#: mail/mail-callbacks.c:2202
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:2248
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "�chec de l'impression du message"
 
-#: mail/mail-callbacks.c:2339
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8872,7 +9045,7 @@ msgstr ""
 "Ce nom sera utilis� uniquement dans un but d'affichage."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
@@ -9014,7 +9187,7 @@ msgstr "Affichage"
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Brouillons"
 
@@ -9022,8 +9195,8 @@ msgstr "Brouillons"
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "�diter..."
 
@@ -9164,7 +9337,7 @@ msgid "Sending Mail"
 msgstr "Envoi du message"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Envoy�"
 
@@ -9414,23 +9587,23 @@ msgstr "Cacher"
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1611
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -9447,27 +9620,27 @@ msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "R�pondre- � :"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "�"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc :"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -9520,11 +9693,11 @@ msgstr "Pointeur sur des donn�es externes inconnues (� %s � type)"
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malform�e"
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9533,28 +9706,28 @@ msgstr ""
 "Ne peut enregistrer les m�ta-informations du dossier; vous \n"
 "n'allez probablement plus pouvoir ouvrir ce dossier : %s : %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 "Impossible de sauvegarder les m�ta-informations du dossier dans %s : %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossible de supprimer les m�ta-informations du dossier %s : %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ne peut �tre reconfigurer cr il ne s'agit pas d'un dossier local."
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9562,16 +9735,16 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette bo�te aux lettres, \n"
 "vous aurez besoin de la r�parer manuellement."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 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:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9580,7 +9753,7 @@ msgstr ""
 "Erreur durant � %s � :\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9589,25 +9762,7 @@ msgstr ""
 "Erreur durant l'ex�cution de l'op�ration :\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:658 mail/mail-session.c:246
-msgid "Remember this password"
-msgstr "Se souvenir du mot de passe"
-
-#: mail/mail-mt.c:659 mail/mail-session.c:247
-msgid "Remember this password for the remainder of this session"
-msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
-
-#: mail/mail-mt.c:713 mail/mail-session.c:298
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Saisissez le mot de passe pour %s"
-
-#: mail/mail-mt.c:716 mail/mail-session.c:301
-msgid "Enter Password"
-msgstr "Saisissez le mot de passe"
-
-#: mail/mail-mt.c:1169
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -9619,48 +9774,43 @@ msgstr "Filtrage du dossier"
 msgid "Fetching Mail"
 msgstr "Rapatriement du courrier"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ">Toutefois, le message a �t� correctement envoy�."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d du %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Echec sur le message %d parmis %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Termin�"
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Sauvegarde du message dans le dossier"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "D�placement des messages vers %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Ne peut copier le dossier � %s � sur lui m�me."
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "D�placement"
@@ -9675,7 +9825,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans � %s �"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Corbeille"
 
@@ -9776,87 +9926,96 @@ msgstr "Reconnexion � %s"
 msgid "_Search"
 msgstr "Rechercher"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Message sans t�tre)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Message sans t�tre"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Message vide"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Trouver dans le message"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Sensible � la casse"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Recherche vers l'avant"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Rechercher : "
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Correspond :"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveur : %s, Type : %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Chemin : %s, Type : %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Envoyer & Recevoir le courrier"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Annuler tout"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Mise � jour..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Annul�."
 
-#: mail/mail-session.c:197
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "L'utilisateur a annul� la requ�te"
 
-#: mail/mail-tools.c:249
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Saisissez le mot de passe pour %s"
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr "Saisissez le mot de passe"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Message suivi"
 
@@ -9864,17 +10023,17 @@ msgstr "Message suivi"
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise � jours des dossiers virutels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9887,28 +10046,28 @@ msgstr ""
 "        � %s �\n"
 "Et ont �t� mis � jour."
 
-#: mail/mail-vfolder.c:637
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "�diter le dossier virtuel"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'�dition du dossier virtuel � %s � qui n'existe pas."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Pas de sujet)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Message"
@@ -9969,7 +10128,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Generation de la liste des messages"
 
@@ -10005,16 +10164,16 @@ msgstr "Abonnement au dossier � %s �"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "D�sabonnement du dossier � %s �"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a �t� s�lectionn�"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Veuillez s�lectionner un serveur."
 
@@ -10054,88 +10213,90 @@ msgstr "Se _d�sabonner"
 msgid "Evolution component for the executive summary."
 msgstr "Composant pour le r�sum�"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Dossier contenant le r�sum� d'Evolution"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Impossible d'initialiser le composant � R�sum� � d'Evolution."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Pas de rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "R�sum� de courrier"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nom :"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "_R�glages r�sum�"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Erreur lors du t�l�chargement des donn�es RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Aucune t�che"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Aucune description)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Ma M�t�o"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 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>"
 
@@ -10143,31 +10304,23 @@ msgstr "<dd><b>Le serveur de m�t�o ne peut �tre contact�</b></dd>"
 msgid "Weather"
 msgstr "M�t�o"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "KPRX:LSST:LFLY"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "R�gions"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A %d %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimer le r�sum�"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "�chec de l'impression du r�sum�"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Le composant � R�sum� � n'a pas pu initialiser Bonobo.\n"
 
@@ -11478,23 +11631,23 @@ msgstr "Montrer les d�tails"
 msgid "Cancel Operation"
 msgstr "Annuler l'op�ration"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Bo�te de r�ception"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Bo�te d'exp�dition"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11502,17 +11655,17 @@ msgstr ""
 "Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
 "suppl�mentaires dans votre r�pertoire personnel d'Evolution."
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Veuillez cliquez sur � Valider � pour installer les fichiers, ou � Annuler � "
 "pour quitter."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre � jour les fichiers correctement"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11523,7 +11676,7 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11532,7 +11685,7 @@ msgstr ""
 "Une erreur est survenue durant la copie des fichiers dans\n"
 "� %s �."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11543,7 +11696,7 @@ msgstr ""
 "D�placez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11557,7 +11710,7 @@ msgstr ""
 "le lancement d'Evolution.\n"
 "Voulez-vous supprimer ce r�pertoire ?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11568,6 +11721,19 @@ msgstr ""
 "d'Evolution. D�placez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: 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."
@@ -11618,7 +11784,7 @@ msgstr "Supprimer � %s �"
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�tes-vous s�r de vouloir supprimer le dossier � %s � ?"
 
-#: shell/e-shell-folder-commands.c:456
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11627,15 +11793,21 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "� %s �"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier � %s � en : "
 
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Renommer le dossier"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Le nom de dossier sp�cifi� n'est pas valide : %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11645,32 +11817,11 @@ msgstr ""
 "Ne peut cr�er le dossier sp�cifi� :\n"
 "� %s �"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Aucun nom de dossier sp�cifi�"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Le nom de dossier ne peut contenir le caract�re RC"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Le dossier ne peut contenir le s�parateur de r�pertoire"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr " � . � et  � .. � sont r�serv�s aux noms de dossiers."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Le nom de dossier sp�cifi� n'est pas valide : %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cr�ez un nouveau dossier"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11678,19 +11829,19 @@ 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:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Choisissez l'outils d'importation � lancer"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11704,13 +11855,13 @@ msgstr ""
 "Vous pouvez s�lectionner � Automatique � si vous l'ignorez, et Evolution "
 "essaiera de lutiliser."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Veuillez s�lectionner les informations que vous d�sirez importer"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11721,7 +11872,7 @@ msgstr ""
 "L'importateur n'est pas pr�t.\n"
 "Attente de 5 secondes avant un nouvel essai."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11730,16 +11881,16 @@ msgstr ""
 "Importation %s\n"
 "Importation �l�ment %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier � %s � n'existe pas"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Vous ne pouvez importer que vers des dossiers locaux"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11748,11 +11899,11 @@ msgstr ""
 "Il n'y a pas d'outils d'import capable de traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11761,17 +11912,17 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11780,31 +11931,31 @@ msgstr ""
 "Importation %s\n"
 "Importation �l�ment 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "S�lectionner un fichier"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importer les donn�es et r�glages d'autres programmes"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importer un seul fichier"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11812,42 +11963,50 @@ msgstr ""
 "Attendez S.V.P...\n"
 "Recherche des param�trages existants"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Importateurs intelligents de d�marrage"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "S�lectionnez un Dossier"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 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:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Fermeture des connexions..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d) Impossible de lancer l'interface de l'assistant du lecteur de "
+"courriers\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "(%s:%d) Impossible de lancer l'interface de l'assistant du lecteur de "
 "courriers\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11855,11 +12014,28 @@ msgstr ""
 "S�lectionnez les informations\n"
 "que vous d�sirez importer S.V.P"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Aucun nom de dossier sp�cifi�"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Le nom de dossier ne peut contenir le caract�re RC"
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Ce dossier ne peut contenir de messages."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr " � . � et  � .. � sont r�serv�s aux noms de dossiers."
+
+#: shell/e-shell-view-menu.c:165
 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:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut �tre ex�cut�."
 
@@ -11893,11 +12069,15 @@ msgid "Error executing %s."
 msgstr "Erreur � l'ex�cution de %s"
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Travail En ligne"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Travail _Hors ligne"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
@@ -11905,49 +12085,39 @@ msgstr "Travail _Hors ligne"
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affich�)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est en ligne. Cliquez sur ce bouton pour tavailler hors "
 "ligne."
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour tavailler en "
 "ligne."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut param�trer le stockage local -- %s"
 
-#: shell/e-shell.c:1642
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11958,35 +12128,31 @@ msgstr ""
 "termin� de mani�re inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces donn�es � nouveau."
 
-#: shell/e-shell.c:1865 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1867
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:1869
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:1871
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Base de donn�es de configuration non trouv�e"
 
-#: shell/e-shell.c:1873 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Erreur g�n�rique"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11995,111 +12161,111 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "� %s � de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Renommer le groupe de raccourcis s�lectionn� par :"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Petites icones"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Afficher les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Grandes icones"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Afficher les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Supprimer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Re_nommer ce groupe..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Masquer la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Masquer la barre de raccourcis"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Renommer le raccourci"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Renommer le raccourci s�lectionn� par :"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Ouvrir le dossier li� � ce raccourci"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "_Ouvrir dans une nouvelle fen�tre"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ouvrir le dossier li� � ce raccourci dans une nouvelle fen�tre"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Renommer ce raccourci"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "Supprimer"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprimer ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Erreur lors de l'enregistrement des raccourcis."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12108,133 +12274,133 @@ msgstr ""
 "Impossible de transf�rer le dossier :\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le m�me nom existe d�j�"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier sp�cifi� n'est pas valide"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisamment d'espace pour cr�er le dossier"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Le dossier n'est pas vide"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas impl�ment� dans ce stockage"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Op�ration non support�e"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 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:523
+#: shell/e-storage.c:522
 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:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ne peut faire un dossier un enfant de ses descendants"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Impossible de cr�er un dossier avec ce nom"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fait)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "Erreur CORBA"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Interrompu"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Argument invalide"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "A d�j� un propri�taire"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Pas de propri�taire"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Non trouv�e"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Tyoe non-support�"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Sch�ma non support�"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Op�ration non-support�e"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "A des sous-dossiers"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Pas de place restante"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "L'ancien propri�taire s'est termin�"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12245,7 +12411,7 @@ msgstr ""
 "\n"
 "Erreur inconnue"
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12257,7 +12423,7 @@ msgstr ""
 "L'erreur du syst�me de composants est :\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12367,85 +12533,68 @@ msgstr ""
 "Avec cet assistant vous serez guid� dans le processus\n"
 "d'importation de fichiers externes dans Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importateurs"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Ne pas importer"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Ne plus me demander"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ne peut importer de donn�es depuis les fichiers suivants :"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se ferme..."
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Bonjour.\n"
-"Merci d'avoir pris le temps de t�l�charger cette version d'�valuation\n"
-"de la suite de travail collaboratif Evolution.\n"
-"\n"
-"Ximian Evolution n'est pas encore termin�e. Le but approche, mais des\n"
-"caract�ristiques sont soit manquantes soit � demi fonctionnelles.\n"
-"\n"
-"Si vous trouvez des bogues, reportez les nous � bugzilla.ximian.com.\n"
-"Cette application est livr�e sans garantie et ne convient pas\n"
-"aux individus sujets � de violentes col�res.\n"
-"\n"
-"Nous esp�rons que vous appr�cierez le r�sultat de notre dur labeur,\n"
-"et nous attendons avec impatience vos contributions !\n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Merci\n"
-"L'�quipe de Ximian Evolution\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne peut acc�der au shell de Ximian Evolution."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne peut initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:344
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "D�sactiver la fen�tre de d�marrage"
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de d�boguage de tous les composants � un fichier."
 
-#: shell/main.c:387
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Erreur de chargement du fichier : %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Ouvrir un fichier"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Ins�rer un fichier"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Aucun nom de dossier sp�cifi�"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12725,11 +12874,12 @@ msgstr "Imprimer..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Enregistrer"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Enregistrer et Quitter"
 
@@ -12745,7 +12895,7 @@ msgstr "Enregistrer cet �l�ment sur le disque"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fichier"
@@ -12767,7 +12917,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Enregistrer"
 
@@ -12827,10 +12977,6 @@ msgstr "Pr�voir une r�union pour cet �l�ment"
 msgid "Customise My Evolution"
 msgstr "Adapter - Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annuler"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annuler l'op�ration courante du courrier"
@@ -13398,7 +13544,7 @@ msgstr "Fermer cette fenetre"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Fermer"
@@ -13429,8 +13575,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Coder ce message avec votre certificat de cryptage S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13481,7 +13628,7 @@ msgid "Save in folder..."
 msgstr "Enregistrer dans le dossier..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Enregistrer le fichier courant"
 
@@ -13574,7 +13721,7 @@ msgid "_From Field"
 msgstr "Champ _From"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Ins�rer"
 
@@ -13590,7 +13737,7 @@ msgstr "Champ _R�pondre �"
 msgid "_Security"
 msgstr "_S�curit�"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_ide"
 
@@ -13826,10 +13973,6 @@ msgstr "Raccourci"
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Travail _Hors ligne"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Modifier le param�trage du r�sum�"
@@ -13904,136 +14047,136 @@ msgstr ""
 "s�lectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour r�duire."
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Vue courante"
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Vues d�finies"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit �tre dans le format : %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La pourcentage doit �tre compris entre 0 et 100 inclus"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balte"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinois"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grec"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonais"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Cor�en"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turc"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Europ�en de l'Ouest"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Simplifi�"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nouveau"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caract�res inconnu : %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caract�res � utiliser"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Autre..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Codage caract�res"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "�diteur de recherche"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Ajouter aux recherches sauvegard�es"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Tous"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Montrer tout"
 
@@ -14076,18 +14219,89 @@ 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:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs() : Ne peut initialiser GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba() : Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarme le %A %d %b %Y %H:%M"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "%s � un moment inconnu"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Inviter d'autres personnes"
+
+#~ msgid "_Confidential"
+#~ msgstr "Con_fidentiel"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard : "
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Ne peut copier le dossier � %s � sur lui m�me."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "KBOS:ZSAM:EGAA"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "KPRX:LSST:LFLY"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Le dossier ne peut contenir le s�parateur de r�pertoire"
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Bonjour.\n"
+#~ "Merci d'avoir pris le temps de t�l�charger cette version d'�valuation\n"
+#~ "de la suite de travail collaboratif Evolution.\n"
+#~ "\n"
+#~ "Ximian Evolution n'est pas encore termin�e. Le but approche, mais des\n"
+#~ "caract�ristiques sont soit manquantes soit � demi fonctionnelles.\n"
+#~ "\n"
+#~ "Si vous trouvez des bogues, reportez les nous � bugzilla.ximian.com.\n"
+#~ "Cette application est livr�e sans garantie et ne convient pas\n"
+#~ "aux individus sujets � de violentes col�res.\n"
+#~ "\n"
+#~ "Nous esp�rons que vous appr�cierez le r�sultat de notre dur labeur,\n"
+#~ "et nous attendons avec impatience vos contributions !\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Merci\n"
+#~ "L'�quipe de Ximian Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
 #~ msgid "Summarising folder"
 #~ msgstr "R�sum� du dossier"
 
@@ -14116,9 +14330,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Ximian Evolution"
 #~ msgstr "Ximian Evolution"
 
-#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -14224,10 +14435,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ "Ouups !  Les vues pour � %s � sont mortes de mani�re inattendue.  :-(\n"
 #~ "Cela signifie probablement que le composant %s a plant�."
 
-#, 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 �."
@@ -14343,10 +14550,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %d/%m/%Y"
 
-#, fuzzy
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "No such folder /%s"
 #~ msgstr "Aucun dossier � %s �."
 
@@ -14465,9 +14668,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Pine mail"
 #~ msgstr "Courrier Pine"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Utilitaire pour le composant de messagerie d'Evolution."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Message suivi :\n"
 
@@ -14610,9 +14810,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "D�l�gu� Par :"
 
-#~ msgid "Task"
-#~ msgstr "T�che"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% Termin� :"
 
@@ -14897,10 +15094,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Edit Task"
 #~ msgstr "�diter la t�che"
 
-#, fuzzy
-#~ msgid "Percent complete"
-#~ msgstr "Pourcentage termin�"
-
 #~ msgid "Mark the task complete"
 #~ msgstr "Marque la t�che comme compl�t�e"
 
@@ -14935,10 +15128,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Add to Calendar"
 #~ msgstr "Ajouter au calendrier"
 
-#, fuzzy
-#~ msgid " Tentative "
-#~ msgstr "Essai"
-
 #~ msgid "Update Calendar"
 #~ msgstr "Mettre � jour le calendrier"
 
diff --git a/po/ga.po b/po/ga.po
index 2cf4cbf69a..8d79e3e081 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -21,301 +29,306 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Ainm"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "R-Post"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 #, fuzzy
 msgid "Primary"
 msgstr "Tosa�ocht"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Tosa�ocht"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Teoranta"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Greamaigh"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Baile"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Guth�n P�ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Car"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Baile 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Eile"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Facs Eile"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Raidio"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Rphost 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Rphost 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Idirl�on"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Roinn"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Oifig"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Oifig"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Tid�al"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Bainisteoir"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Bealtaine"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Feilire"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Data Breithe: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Ainm Chomad:"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Carta: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -323,37 +336,37 @@ msgstr ""
 "\n"
 "Ainm: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +374,7 @@ msgstr ""
 "\n"
 "Data Breithe: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +382,7 @@ msgstr ""
 "\n"
 "Seoladh:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,13 +390,13 @@ msgstr ""
 "\n"
 " Bosca Phoist: "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -391,7 +404,7 @@ msgstr ""
 "\n"
 "  Sr�id:       "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -399,7 +412,7 @@ msgstr ""
 "\n"
 "  Cathair:     "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
@@ -408,7 +421,7 @@ msgstr ""
 "\n"
 "  Contae:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -416,7 +429,7 @@ msgstr ""
 "\n"
 "  C�d Phoist: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -424,13 +437,13 @@ msgstr ""
 "\n"
 "  T�r:         "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -438,7 +451,7 @@ msgstr ""
 "\n"
 "Guth�in:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -446,7 +459,7 @@ msgstr ""
 "\n"
 "Guth�n:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -454,7 +467,7 @@ msgstr ""
 "\n"
 "R-phost:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -462,19 +475,19 @@ msgstr ""
 "\n"
 "R-phost:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -482,19 +495,19 @@ msgstr ""
 "\n"
 "�iti�l: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -502,37 +515,37 @@ msgstr ""
 "\n"
 "  Ainm:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -548,13 +561,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -562,12 +575,12 @@ msgstr ""
 "\n"
 "Eochair Poibl�: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Post an sce�l seo"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Te�p ag fork: %s"
@@ -576,85 +589,87 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Ag L�d�il feilire..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "Te�p ag fork: %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -698,42 +713,42 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "CHl�fhoireanna"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr ""
 
@@ -766,7 +781,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr ""
 
@@ -850,16 +865,16 @@ msgstr "Ainm Grupa:"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Suimigh"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Eagar"
@@ -878,22 +893,27 @@ msgstr "Tosa�ocht"
 msgid "_Server name:"
 msgstr "Post"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -901,48 +921,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Te�p ag fork: %s"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -956,53 +976,53 @@ msgstr ""
 msgid "(none)"
 msgstr "(gan ainm)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "Fillte�n _Nua"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Seoladh Eile"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -1014,50 +1034,59 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Scr�os"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Scr�os Gach Rud"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Post"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1119,12 +1148,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
@@ -1193,9 +1222,9 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Scr�os"
@@ -1264,37 +1293,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "R-phost"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2392,7 +2430,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr ""
 
@@ -2438,152 +2476,159 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "Post"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Osc�il"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Sheoladh Chuig duine"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "_Post sce�l"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Priont�il"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Scr�os"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "Earraigh I/A"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr ""
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2591,75 +2636,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Pr�omh Guth�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Guth�n sa Gn�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Guth�n sa Baile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Seoladh Bhaile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Guth�n P�ca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Guth�n Ghluaste�in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Guth�n Eile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Seoladh Eile"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2842,97 +2896,110 @@ msgstr "Leitheid:"
 msgid "_Font..."
 msgstr "Chl�fhoireann..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Priont�il"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Priont�il"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Socraigh Priont�il "
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Eagar coinne"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Gn�th"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
+msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
@@ -2944,48 +3011,28 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr ""
-
-#: 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:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
-msgid "Notification about your appointment"
-msgstr "_Coinne"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr ""
+msgid "Starting:"
+msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Sc�al � %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3006,11 +3053,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3018,7 +3065,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3029,38 +3076,39 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr ""
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "i%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "aa %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%d %B"
@@ -3068,152 +3116,136 @@ msgstr "%d %B"
 #. 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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Priobh�dach"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "T"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Ao"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "T�"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "N�l"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "Radharc Carta"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "Seachtain"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "Priont�il"
@@ -3230,12 +3262,12 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Feilire"
 
@@ -3243,9 +3275,9 @@ msgstr "Feilire"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
@@ -3254,28 +3286,28 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "_Teasc Nua"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -3347,52 +3379,52 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "la(e)"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr " 1 lae"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr " seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d uaireanta"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 uair"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d noime�id"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 noime�d"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " 1 soic�nd"
@@ -3453,17 +3485,12 @@ msgstr "_Coinne"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3485,7 +3512,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3516,7 +3543,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr ""
 
@@ -3571,7 +3598,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Aoine"
 
@@ -3586,7 +3613,7 @@ msgid "Minutes"
 msgstr "05 noimea�d"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Luain"
 
@@ -3595,7 +3622,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -3618,7 +3645,7 @@ msgid "Su_n"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -3637,7 +3664,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -3659,12 +3686,12 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Mairt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Ce�d"
 
@@ -3747,170 +3774,174 @@ msgstr "Cea"
 msgid "before the start of the appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+msgid "Could not update object!"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "S�bh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -3930,25 +3961,25 @@ msgstr "Scr�os"
 msgid "Enter Delegate"
 msgstr "Scr�os"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr ""
 
@@ -3967,11 +3998,12 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr ""
 
@@ -3981,13 +4013,13 @@ msgid "F_ree"
 msgstr "_Seachtain"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Priont�il"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
@@ -3998,7 +4030,7 @@ msgid "Show Time As"
 msgstr "Taispe�in coinn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Post"
@@ -4011,33 +4043,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Guth�n Ghluaste�in"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Scr�os..."
@@ -4082,6 +4100,7 @@ msgid "Member"
 msgstr "Nollag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4100,7 +4119,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Saghas"
@@ -4115,7 +4134,8 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4126,23 +4146,23 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "l�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4208,19 +4228,15 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4239,7 +4255,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4252,144 +4268,172 @@ msgstr "Tosa�ocht"
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "Osc�il"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr ""
 
@@ -4420,8 +4464,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr ""
 
@@ -4433,326 +4477,406 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "_Fillte�n"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "eolas fheilire"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Feilire"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "iEarraidh gan Aithne"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Fillte�n _Nua"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: calendar/gui/e-itip-control.c:795
+msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "M�id"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Ag Cealaigh..."
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4793,197 +4917,220 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Guth�n Ghluaste�in"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Ainm Grupa:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Cahtaoirleach"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Freagra"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Scr�os"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr ""
-
 #: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Osc�il Feilire"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aibre�in"
@@ -5040,233 +5187,277 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Ce"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "De"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "_Teasc"
+
+#: calendar/gui/print.c:2262
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "_Cathair:"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "CHl�fhoireanna"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Socraigh Priont�il "
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5274,125 +5465,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "LMCDASD"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5416,7 +5607,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5424,7 +5615,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5432,104 +5623,104 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "_Post sce�l"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5538,187 +5729,187 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Te�p ag fork: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Earraidh gan aithne)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5738,7 +5929,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5748,12 +5939,12 @@ msgid "(unknown host)"
 msgstr "(�st gan aithne)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5851,7 +6042,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5868,8 +6059,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Pasfhocal"
 
@@ -5898,55 +6089,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5991,17 +6182,17 @@ msgstr "_Post sce�l"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6009,7 +6200,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6019,7 +6210,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6031,37 +6222,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
@@ -6094,59 +6285,59 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Te�p ag fork: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "_Post sce�l"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr ""
 
@@ -6154,7 +6345,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Fillte�in"
 
@@ -6187,28 +6378,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6216,89 +6407,91 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6309,78 +6502,83 @@ msgid "Could not save summary: %s: %s"
 msgstr "Te�p ag fork: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "_Post sce�l"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6395,171 +6593,182 @@ msgstr "Te�p ag fork: %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:265
+msgid "Mail append cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan aithne: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+msgid "MH append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "N�l aon Eolaire `%s' ann."
@@ -6569,454 +6778,438 @@ msgstr "N�l aon Eolaire `%s' ann."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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 ""
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nuachtain USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuachtain USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Gan aithne)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�l aon eolaire `%s' ann."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7024,168 +7217,168 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -7217,52 +7410,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7273,66 +7466,66 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "S�nbh�il le..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Rabhadh"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7341,50 +7534,58 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Osc�il Comhad"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7434,15 +7635,24 @@ msgstr "Abair is %s"
 msgid "Subject does not contain"
 msgstr ""
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
@@ -7501,30 +7711,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7654,23 +7864,23 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7685,39 +7895,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Gan Tid�al"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -7911,7 +8121,7 @@ msgstr ""
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 #, fuzzy
 msgid "Sender"
 msgstr "Post"
@@ -7945,7 +8155,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Abair"
@@ -7958,15 +8168,15 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Eagar"
@@ -7975,102 +8185,97 @@ msgstr "Eagar"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "Post Nua"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Carta: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "_Seoladh:"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Priont�il"
@@ -8107,253 +8312,258 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "_Roghanna..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Post sce�l"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Post sce�l"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Post"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Post"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "Post"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_S�bh�il le..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Fillte�n"
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Gn�th"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8376,34 +8586,44 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "Taispe�in coinn�"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "_Inneacs"
+
+#: mail/local-config.glade.h:4
 #, fuzzy
 msgid "Mailbox Format"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8422,23 +8642,23 @@ msgstr "Evolution"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 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:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8454,54 +8674,54 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Scr�os"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Abair is %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Sc�al � %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8509,125 +8729,125 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Post"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "iEarraidh gan Aithne"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8635,32 +8855,32 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "Comhad"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8702,16 +8922,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Ainm Grupa:"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8722,16 +8942,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -8748,31 +8968,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:6
+msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
-msgid "Accounts"
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
+msgid "Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8784,28 +9004,24 @@ msgid "Authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
+msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "D�n"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Eolas"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8815,355 +9031,378 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "_Gn�th"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Taispea�n"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Edit..."
 msgstr "Eagar"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "_Nuacht"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "Nota"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+msgid "Re_member this password"
+msgstr ""
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "_Post sce�l"
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Sent messages folder:"
-msgstr "_Post sce�l"
+#: mail/mail-config.glade.h:76
+msgid "Ser_ver requires authentication"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server Type: "
+msgid "Server _Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Sc�r"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Eolas"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "_Fillte�n"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Authentication Type: "
+msgstr ""
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "_Fillte�n"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "_Seoladh:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Ainm:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "�st:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "Ainm:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Treshu�omh"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Sl�"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Post"
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Ainm �saideoir"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Gach"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Freagra"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "soicind."
 
@@ -9203,238 +9442,211 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 #, fuzzy
 msgid "Loading message content"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr ""
 "\n"
 "�iti�l: "
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Post sce�l"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "S�nbh�il le..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "_Seoladh:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "�:"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "Freagrair"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Do:"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr ""
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1397
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Post an sce�l seo"
-
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Cumraigh %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Te�p ag fork: %s"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Pasfhocal"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9443,127 +9655,122 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Post"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Cr�ochnaithe.`"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Te�p ag fork: %s"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Bruscar"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9572,28 +9779,28 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh %s"
@@ -9602,106 +9809,116 @@ msgstr "Cumraigh %s"
 msgid "_Search"
 msgstr "C_uardaigh..."
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(gan tide�l)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "Sce�l"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "Sl�"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Saghas:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Te�p ag fork: %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Pasfhocal"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
@@ -9711,7 +9928,7 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9720,30 +9937,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "Abair"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Sce�l"
@@ -9805,7 +10022,7 @@ msgstr "%a %l:%M %"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "Post an sce�l seo"
@@ -9832,26 +10049,26 @@ msgstr ""
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Eolaire"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -9892,130 +10109,124 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
+#: my-evolution/component-factory.c:153
+msgid "Cannot initialize Evolution's Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "Coinne"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "Taispe�in coinn�"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Ainm:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "_Nuacht"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "_Teasc Nua"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Freagra"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Eile"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr ""
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Tosa�ocht"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -10074,7 +10285,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10151,1073 +10362,1075 @@ msgstr "_Nota�:"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "Taispe�in"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 #, fuzzy
 msgid "Rain"
 msgstr "Raidio"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "Taispe�in"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "R-Post"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Taispe�n gach Rud"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Post"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "iEarraidh gan Aithne"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "D�n an fhuinneog seo"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "Sc�r"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "D�n an fhuinneog seo"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "Sa"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
-msgstr ""
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
+msgstr "Sathairn"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "_Post sce�l"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Taispe�n gach Rud"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Tosa�ocht"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Post"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "L�nasa"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11227,8 +11440,9 @@ msgid " _Remove"
 msgstr "Scr�os"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
-msgstr ""
+#, fuzzy
+msgid "Add n_ews feed"
+msgstr "Fillte�n _Nua"
 
 #: my-evolution/my-evolution.glade.h:3
 msgid "Al_l stations:"
@@ -11243,12 +11457,12 @@ msgstr "_Fillte�n"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11290,14 +11504,14 @@ msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
+msgid "Show temperatures in:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Tasks "
 msgstr "_Teasc"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr ""
@@ -11315,14 +11529,14 @@ msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_Five days"
 msgstr "Aoine"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_Mail"
@@ -11362,40 +11576,40 @@ msgstr "Taispe�n gach Rud"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 #, fuzzy
 msgid "Inbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillte�n"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11403,14 +11617,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11418,7 +11632,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11427,7 +11641,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11435,6 +11649,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "C�ipcheart 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11447,61 +11674,67 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "_Fillte�n"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "S�bh�il 'san _eolaire"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Scr�os"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11509,50 +11742,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nua..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(gan tide�l)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11561,13 +11773,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11575,188 +11787,196 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 #, fuzzy
 msgid "Select a file"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "�:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:168
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+#: shell/e-shell-startup-wizard.c:169
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy was not found in your $PATH."
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:209
-msgid "Bug buddy could not be run."
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:235
-#, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolution"
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
+msgstr ""
 
-#: 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-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
 
-#: 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."
+#: shell/e-shell-view-menu.c:165
+msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:173
+msgid "Bug buddy could not be run."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "Faoi Evolution..."
+
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
 
@@ -11764,46 +11984,36 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "Ar Bith"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11811,215 +12021,312 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Ceart go Leor"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Ainm Grupa:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Post an sce�l seo"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Ainm �saideoir"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Scr�os"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, 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
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(gan ainm)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Earraigh I/A"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Te�p ag fork: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "Earraigh I/A"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Ar Bith"
+
+#: shell/evolution-shell-component.c:1019
+msgid "Not found"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+msgid "Unsupported operation"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Earraigh I/A"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "_�irigh"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Feilire"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Post an sce�l seo"
+
+#: shell/evolution-shell-component.c:1039
+msgid "No space left"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "iEarraidh gan Aithne"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr ""
@@ -12117,77 +12424,70 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution"
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr ""
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Osc�il Comhad"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12286,7 +12586,7 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr ""
@@ -12308,7 +12608,7 @@ msgid "_Forward Contact..."
 msgstr ""
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Priont�il..."
@@ -12357,7 +12657,7 @@ msgstr "Lae"
 msgid "Delete the appointment"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr ""
 
@@ -12491,11 +12791,12 @@ msgstr "Cl�d�il..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "S�bh�il"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "S�bh�il agus D�n"
 
@@ -12511,7 +12812,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Comhad"
@@ -12533,7 +12834,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_S�bh�il"
 
@@ -12599,11 +12900,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "%s - Evolution %s"
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "Ag Cealaigh..."
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -12877,316 +13173,344 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Display the next important message"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:18
+msgid "Display the next important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Abair"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward As"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Load _Images"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Increase the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark as I_mportant"
+msgid "Load _Images"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:43
+msgid "Mark as I_mportant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Eile"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "Sce�l"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Riomh"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Freagrair"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Abair"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Abair"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Abair"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+msgid "_Larger"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Taispea�n"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Uirlis�"
@@ -13197,7 +13521,7 @@ msgstr "D�n an fhuinneog seo"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_D�n"
@@ -13230,11 +13554,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr ""
+#, fuzzy
+msgid "For_mat"
+msgstr "Gn�th"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13283,7 +13609,7 @@ msgid "Save in folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr ""
 
@@ -13387,7 +13713,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr ""
 
@@ -13404,7 +13730,7 @@ msgstr "Freagrair"
 msgid "_Security"
 msgstr "_Sl�nd�il"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "C_�idi�"
 
@@ -13660,10 +13986,6 @@ msgstr ""
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr ""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -13742,137 +14064,141 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMCDASD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B &Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Anois"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Inni�"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "Seachtain"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Turkish"
 msgstr "Bruscar"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 #, fuzzy
 msgid "New"
 msgstr "_Nua"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "Eile"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "Cuardaigh"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Taispe�n gach Rud"
 
@@ -13915,19 +14241,59 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "iEarraidh gan Aithne"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Carta: "
+
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Post an sce�l seo"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Te�p ag fork: %s"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Go raibh maith agat\n"
+#~ "An Fhoireann Evolution\n"
+
+#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Pasfhocal"
 
@@ -13936,10 +14302,6 @@ msgstr ""
 #~ msgstr "Post"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "eolas fheilire"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "_Coinne"
 
@@ -13963,10 +14325,6 @@ msgstr ""
 #~ msgid "Rename"
 #~ msgstr "Ainm Chomad:"
 
-#, fuzzy
-#~ msgid "_Import File..."
-#~ msgstr "S�bh�il 'san _fillte�n"
-
 #~ msgid "Ok"
 #~ msgstr "Ceart go Leor"
 
@@ -13991,10 +14349,6 @@ msgstr ""
 #~ msgstr "%a %d/%m/%Y"
 
 #, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
-#, fuzzy
 #~ msgid "No such folder /%s"
 #~ msgstr "Post an sce�l seo"
 
@@ -14089,9 +14443,6 @@ msgstr ""
 #~ msgid "z"
 #~ msgstr "z"
 
-#~ msgid "Open calendar"
-#~ msgstr "Osc�il Feilire"
-
 #~ msgid "Save calendar"
 #~ msgstr "S�bh�il Feilire"
 
@@ -14235,6 +14586,3 @@ msgstr ""
 
 #~ msgid "_Appointment (FIXME)"
 #~ msgstr "_Coinne"
-
-#~ msgid "_Index"
-#~ msgstr "_Inneacs"
diff --git a/po/gl.po b/po/gl.po
index 6929bfabbd..8f1e02173a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -20,6 +20,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "F�brica para importar ficheiros VCard a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importa ficheiros VCard a Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "F�brica para importar ficheiros VCard a Evolution."
@@ -28,308 +38,313 @@ 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-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Arquivar coma"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nome:"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Correo Electr�nico"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Ocupado"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Resposta"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ocupado"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Correo Electr�nico 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "T�tulo"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profesi�n"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "maio"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Alcume"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Alcume"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "C�nxuxe"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Axenda"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL libre-ocupado"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "Ani_versario:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categor�as"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Nome Completo:"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -377,7 +392,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -385,7 +400,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -393,7 +408,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -401,7 +416,7 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -409,7 +424,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -417,7 +432,7 @@ msgstr ""
 "\n"
 "  R�a:         "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -425,7 +440,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -433,7 +448,7 @@ msgstr ""
 "\n"
 "  Rexi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -441,7 +456,7 @@ msgstr ""
 "\n"
 "  C�digo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -449,7 +464,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -457,7 +472,7 @@ msgstr ""
 "\n"
 "Etiqueta de Entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -465,7 +480,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -473,7 +488,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -481,7 +496,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -489,7 +504,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -497,7 +512,7 @@ msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -505,7 +520,7 @@ msgstr ""
 "\n"
 "Fuso Horario: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -513,7 +528,7 @@ msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -521,7 +536,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -529,7 +544,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -537,7 +552,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -545,7 +560,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -553,7 +568,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -561,7 +576,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -569,7 +584,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -577,7 +592,7 @@ msgstr ""
 "\n"
 "Categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -595,7 +610,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -603,7 +618,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -611,11 +626,11 @@ msgstr ""
 "\n"
 "Clave P�blica: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -624,39 +639,41 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, 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
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr ""
@@ -664,55 +681,55 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n Enderezo do pilot"
 
@@ -756,41 +773,41 @@ msgstr "F�brica para o men� emerxente de enderezos do Libro de Enderezos"
 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: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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Novo C_ontacto"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Nova _Lista de Contactos"
 
@@ -823,7 +840,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "B�sico"
 
@@ -910,16 +927,16 @@ msgstr "Nome da Cont_a:"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
@@ -936,15 +953,20 @@ msgstr "_Porto:"
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Non foi posible inicializar gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -954,7 +976,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -966,7 +988,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:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -974,42 +996,42 @@ 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:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Calquera campo cont�n"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "O nome cont�n"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "Enderezo cont�n"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -1022,51 +1044,51 @@ msgstr "O URI que ha amosar o Navegador de Cartafoles"
 msgid "(none)"
 msgstr "(ning�n)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Escolla unha Acci�n"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crear un novo contacto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Engadir un enderezo a un contacto existente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Mestura-lo Enderezo de Correo"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Desactivar Petici�ns"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activar Petici�ns (�Perigoso!)"
 
@@ -1080,50 +1102,59 @@ 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:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Eliminar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "�Enviar Correo HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
@@ -1183,12 +1214,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalles"
 
@@ -1256,9 +1287,9 @@ msgstr "_Contactos..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
@@ -1328,37 +1359,47 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "�Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, 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:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "Correo Electr�nico"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Br�tema"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2427,7 +2468,7 @@ msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
@@ -2476,149 +2517,156 @@ msgstr ""
 "O enderezo ou nome cambiado deste contacto xa existe neste\n"
 "cartafol.  �Gostar�alle engadilo de todas maneiras?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "1 tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: 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:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 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:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�xito"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "�Quere gardar os cambios?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 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:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2626,75 +2674,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Prema aqu� para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Tel�fono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Tel�fono do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Tel�fono de Resposta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Tel�fono da Compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Tel�fono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Tel�fono M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Tel�fono do Autom�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Tel�fono do Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Outro Tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2880,94 +2937,109 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Imprimir tarxetas"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Imprimir tarxeta"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Editar cita"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 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/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n ToDo (PorFacer) do pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Compo�ente do resumo executivo da axenda de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visor da axenda iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Compo�ente de Evolution para manexar a axenda."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "F�brica para o compo�ente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "F�brica para o control Axenda de exemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
@@ -2980,47 +3052,29 @@ 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: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: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: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:165
-msgid "Notification about your appointment"
-msgstr "Notificaci�n da s�a cita"
-
-#: 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Opci�ns"
 
-#: 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:218
+msgid "Ending:"
+msgstr ""
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Hora de _finalizaci�n:"
 
-#: 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:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: 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"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarmas"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3039,11 +3093,11 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3051,7 +3105,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3062,137 +3116,116 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: 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:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 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:439
+#: calendar/gui/calendar-commands.c:446
 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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Completada"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"A data ten que se introducir no formato: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3202,53 +3235,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: 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"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Asignada"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Buscar M_ensaxe..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista Diaria"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Vista de Semana Laboral"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Vista Semanal"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Vista Mensual"
 
@@ -3264,12 +3300,12 @@ msgstr "A descrici�n cont�n"
 msgid "Comment contains"
 msgstr "O comentario cont�n"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -3277,9 +3313,9 @@ msgstr "Axenda"
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
@@ -3288,24 +3324,24 @@ msgstr "Tarefas"
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 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:588
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Nova T_arefa"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
@@ -3375,48 +3411,48 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d d�as"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 d�a"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 segundo"
 
@@ -3474,17 +3510,12 @@ msgstr "despois da fin da cita"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "Servidor %s %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3505,7 +3536,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3535,7 +3566,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -3588,7 +3619,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:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Venres"
 
@@ -3601,7 +3632,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Luns"
 
@@ -3610,7 +3641,7 @@ msgid "O_verdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -3631,7 +3662,7 @@ msgid "Su_n"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3648,7 +3679,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:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -3669,12 +3700,12 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "M�rcores"
 
@@ -3743,116 +3774,121 @@ msgstr "M�_r"
 msgid "before the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Mudou o estado da xuntanza. �Enviar unha versi�n actualizada?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta cita?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta entrada de diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi eliminada."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diario foi eliminada"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Fixo cambios. �Quere esquecer estes cambios e pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non fixo cambios, �quere pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Esta tarefa foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diario foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Fixo cambios. �Quere esquecer estes cambios e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Non foi posible actualizar os ficheiros correctamente"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3860,53 +3896,53 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�Est� seguro de que quere borrar %d entradas de diario?"
@@ -3923,26 +3959,26 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -3961,11 +3997,12 @@ msgid "Classification"
 msgstr "Clasificaci�n"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data e Hora"
 
@@ -3974,12 +4011,12 @@ msgid "F_ree"
 msgstr "Lib_re"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "P�_blico"
 
@@ -3989,7 +4026,7 @@ msgid "Show Time As"
 msgstr "Amosa-lo Tempo Coma"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
@@ -4001,32 +4038,20 @@ msgstr "Hora de _finalizaci�n:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr "�Esa persoa xa asiste � xuntanza!"
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr "Presidentes"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr "Participantes Requiridos"
+#: calendar/gui/dialogs/meeting-page.c:422
+#, fuzzy
+msgid "An organizer is required."
+msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr "Participantes Opcionais"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
-msgstr "Non-Participantes"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr "�Esa persoa xa asiste � xuntanza!"
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4066,6 +4091,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4084,7 +4110,7 @@ msgstr "Estado"
 
 #: 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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4099,8 +4125,9 @@ msgid "_Change Organizer"
 msgstr "_Cambiar Organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Convidar a Outros"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Convidar Outros..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
@@ -4110,23 +4137,23 @@ msgstr "_Outro Organizador"
 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:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4190,19 +4217,15 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�Quere gardar os cambios?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A informaci�n da xuntanza cambiou. �Enviar unha versi�n actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informaci�n da tarefa cambiou. �Enviar unha versi�n actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "A entrada do diario cambiou. �Enviar unha versi�n actualizada?"
 
@@ -4221,7 +4244,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4233,138 +4256,169 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Descrici�n:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Confidencial"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data L�mite"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Elimina-los contactos seleccionados"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Borrar esta Tarefa"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"A data ten que se introducir no formato: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Completo"
 
@@ -4395,8 +4449,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4408,85 +4462,124 @@ msgstr "Ordeamento das tarefas"
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 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:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Novo _Evento de D�a Completo"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Ir � Data..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Borrar _T�dalas Ocorrencias"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora do _final da reuni�n:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Completada "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informaci�n de axenda"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "un remitente desco�ecido"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4494,234 +4587,276 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: 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:692
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: 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:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Escolla unha Acci�n"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Actualizaci�n de Tarefa"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Aceptar"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Aceptado"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Tentativa "
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Rexeitado"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informaci�n da Tarefa"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:867
 #, 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:738
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, 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:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, 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:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, 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:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, 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:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, 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:768
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, 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:786
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, 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:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, 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:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, 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:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Petici�n de Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, 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:806
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, 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:834
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, 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:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, 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:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 #, 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:936
+#: calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 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:1183
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4762,193 +4897,215 @@ 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Presidentes"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Participantes Opcionais"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Non-Participantes"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 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
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 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
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 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
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 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
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 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
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 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
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 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
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 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
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 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
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 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
+#: calendar/gui/e-meeting-time-sel.c:2023
 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
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "F�ra da Oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 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
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opci�ns"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Amosar _S� as Horas de Traballo"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Amozar sen _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_T�dalas Persoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "T�dalas _Persoas e Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reuni�n:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Abrindo armacenamento %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Abrir axenda"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -5005,227 +5162,275 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, 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:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "E_stado:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridade:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Porcentaxe completada"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Categor�as: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Co_ntactos:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Configuraci�n da Impresi�n"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks 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/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5233,7 +5438,7 @@ msgstr ""
 "Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas "
 "automaticamente ao novo cartafol de tarefas."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5245,7 +5450,7 @@ msgstr ""
 "Non foi posible migrar algunhas das tarefas, as� que pode tentar facerse "
 "este proceso outra vez no futuro."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5254,7 +5459,7 @@ msgstr ""
 "Non se puido abrir `%s'; non se migrar�n obxectos do cartafol da axenda ao "
 "de tarefas."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5263,83 +5468,83 @@ msgstr ""
 "Non est� soportado o m�todo requirido para cargar `%s'; non se migrar�n "
 "obxectos do cartafol da axenda ao de tarefas."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "o argumento 1 de make-time debe ser unha cadea data/hora ISO 8601"
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que o argumento 2 sexa un enteiro"
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que o argumento 2 sexa un time_t"
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argumento 2 sexa unha cadea"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5347,11 +5552,11 @@ msgstr ""
 "contains? espera que o argumento 1 sexa un de \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera polo menos 1 argumento"
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5359,21 +5564,21 @@ msgstr ""
 "has-categories? espera que t�dolos argumentos sexan cadeas ou un e s� un "
 "argumento sexa un falso booleano (#f)"
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 #, 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:1156
+#: calendar/pcs/query.c:1159
 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"
 
@@ -5397,7 +5602,7 @@ msgstr "Non se soporta o cifrado con esta cifra"
 msgid "Decryption is not supported by this cipher"
 msgstr "Non est� soportado o descifrado desta cifra"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5408,7 +5613,7 @@ msgstr ""
 "As posteriores operaci�ns deste servidor non se han repetir cando\n"
 "se volte conectar � rede."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5419,94 +5624,94 @@ msgstr ""
 "%s\n"
 "Os cambios que se fixeron a este cartafol non se han resincronizar."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Volvendo a sincronizar co servidor"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 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:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, 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:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5515,7 +5720,7 @@ msgstr ""
 "Non se pode analizar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5524,7 +5729,7 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(coinciden-todas) require un �nico resultado booleano"
 
@@ -5533,198 +5738,198 @@ msgstr "(coinciden-todas) require un �nico resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido no contido do corpo, esper�base unha cadea"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Non se puido crear unha canalizaci�n de axuda ao bloqueo: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Non se pode lanza-lo axudante ao bloqueo: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Non se puido bloquear '%s': erro de protocolo con lock-helper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Non se puido bloquear '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "A operaci�n expirou tentando obter o ficheiro de bloqueo sobre %s. T�nteo de "
 "novo m�is tarde."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, 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:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Non foi posible comprobar o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaci�n: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Erro desco�ecido)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erro ao ler o ficheiro de correo: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, 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:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, 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:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:699
+#: camel/camel-pgp-context.c:741
 #, 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:891
+#: camel/camel-pgp-context.c:939
 #, 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:897
+#: camel/camel-pgp-context.c:945
 #, 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
+#: camel/camel-pgp-context.c:956
 #, 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:1076
+#: camel/camel-pgp-context.c:1129
 #, 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
+#: camel/camel-pgp-context.c:1139
 #, 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
+#: camel/camel-pgp-context.c:1146
 #, 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
+#: camel/camel-pgp-context.c:1155
 #, 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
+#: camel/camel-pgp-context.c:1323
 #, 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:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, 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
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Non foi posible cargar %s: Non se soporta a carga de m�dulos neste sistema."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
@@ -5744,7 +5949,7 @@ msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
@@ -5754,12 +5959,12 @@ msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
@@ -5871,7 +6076,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -5888,8 +6093,8 @@ msgid "Unknown authentication state."
 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:68 mail/mail-config.glade.h:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -5918,55 +6123,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:158
+#: 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:166
+#: 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:174
+#: 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:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petici�n de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, 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:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6012,17 +6217,17 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, 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
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6032,7 +6237,7 @@ msgstr ""
 "Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6047,7 +6252,7 @@ msgstr ""
 "\n"
 "�Desexa aceptar de todas maneiras?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6066,41 +6271,41 @@ msgstr ""
 "Estado: %s\n"
 "Pa�s: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, 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:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -6133,57 +6338,57 @@ 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:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, 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:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, 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:274
+#: camel/providers/imap/camel-imap-folder.c:277
 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:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Non foi posible abrir o directorio de cach�: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c: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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, 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
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -6191,7 +6396,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:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -6224,28 +6429,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, 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:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6256,90 +6461,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para armacenar correo local en directorios de correo tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 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:63
+#: camel/providers/local/camel-local-provider.c:62
 #, 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:69
-msgid "Qmail maildir-format mail files"
-msgstr "Ficheiros de correo con formato maildir de Qmail"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+#, fuzzy
+msgid "For storing local mail in maildir directories."
 msgstr "Para armacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Spools mbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 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:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non te�en un inbox"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
@@ -6350,23 +6559,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 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:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Fallo na mensaxe %d"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, 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: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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6375,20 +6589,20 @@ msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non v�lido"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6397,15 +6611,15 @@ msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6414,19 +6628,19 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, 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:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
@@ -6441,29 +6655,34 @@ msgstr "Non foi posible examina-lo cartafol `%s': %s"
 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:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, 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:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Operaci�n cancelada"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6472,17 +6691,17 @@ msgstr ""
 "Non � posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 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:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6491,7 +6710,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6500,14 +6719,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non � un ficheiro normal."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6516,109 +6735,117 @@ msgstr ""
 "Non foi posible borrar o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erro grave do analizador de correo preto da posici�n %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, 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:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non � posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escribir � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, 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:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Enviar mensaxe a un contacto"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � cartafol mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non � un directorio."
@@ -6628,66 +6855,49 @@ 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:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro spool de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 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:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, 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:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, 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:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6696,139 +6906,139 @@ 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
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Non se puido enviar o nome de usuario ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapaz de cargar o ficheiro grouplist para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Novas USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este � un provedor para ler e enviar aos grupos de novas de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opci�n autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Non existe a mensaxe con UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Armacenamento da mensaxe"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Deixar as mensaxes no servidor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 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:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6836,7 +7046,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:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6846,33 +7056,33 @@ 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:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Non foi posible conectarse � servidor: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Non foi posible conectarse � servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6881,12 +7091,12 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Desco�ecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6894,7 +7104,7 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non hai soporte para o mecanismo de autenticaci�n solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6903,203 +7113,203 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Para entregar o correo pas�ndollo � programa \"sendmail\" no sistema local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalizaci�n para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail sa�u co sinal %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail sa�u con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Non foi posible atopar o enderezo 'De' na mensaxe"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Para entregar correo por conexi�n a un servidor de correo remoto usando "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non reco�ecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos par�metros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Par�metro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispo�ible, pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non � local; remitirase a <ruta de env�o>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "A acci�n de correo pedida non foi levada a cabo: caixa de correo non "
 "dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acci�n pedida non foi levada a cabo: caixa de correo non dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Abortouse a acci�n solicitada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; t�nteo con <ruta-de-env�o>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "A acci�n pedida non foi levada a cabo: insuficiente armacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Abortouse a acci�n solicitada: excedeuse da asignaci�n de armacenamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "A acci�n pedida non foi levada a cabo: nome de caixa de correo non admitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comeza a introducci�n da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "A transacci�n fallou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Prec�sase unha transici�n de contrasinal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaci�n � feble de m�is"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neces�tase cifrado para o mecanismo de autenticaci�n solicitado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7110,167 +7320,167 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 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:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Sa�do SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "A petici�n HELO expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A petici�n MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A petici�n RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petici�n DATA expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, 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:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, 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:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
@@ -7302,52 +7512,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 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:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7360,7 +7570,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7369,29 +7579,29 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7399,16 +7609,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:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7417,7 +7627,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7426,7 +7636,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7435,7 +7645,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7444,7 +7654,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7454,28 +7664,39 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Non foi posible crear a fiestra do compositor."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Non foi posible crear a fiestra do compositor, porque a�nda\n"
+"non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7483,11 +7704,11 @@ 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:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7535,15 +7756,24 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7602,30 +7832,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 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:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7764,7 +7994,7 @@ msgstr "Ent�n"
 msgid "Add action"
 msgstr "Engadir acci�n"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7773,16 +8003,16 @@ 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:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Introduza o URI do cartafol"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar un cartafol>"
 
@@ -7799,39 +8029,39 @@ msgstr ""
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Sen t�tulo"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "sa�nte"
 
@@ -8024,7 +8254,7 @@ msgstr "Respondido a"
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Autor"
 
@@ -8056,7 +8286,7 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
@@ -8069,15 +8299,15 @@ msgstr "foi posterior a"
 msgid "was before"
 msgstr "foi anterior a"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -8085,43 +8315,43 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuaci�n"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 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:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s coma %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8129,20 +8359,15 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Elm.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Tarxeta: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Libro de Enderezos"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8150,23 +8375,23 @@ msgstr ""
 "Evolution atopou ficheiros GnomeCard.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando os datos antigos de Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8174,12 +8399,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 #, fuzzy
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution est� importando os seus datos de Pine antigos"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8187,7 +8412,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimir"
@@ -8224,242 +8449,247 @@ msgstr "F�brica para a compo�ente Resumo de Correo."
 msgid "Mail configuration interface"
 msgstr "Interface de configuraci�n do correo"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Cartafol que cont�n correo"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Cartafol de armacenamento de correo (interno)"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Lixo Virtual"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Cartafol de Lixo Virtual"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Non foi posible conectarse � servidor: %s."
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nova _Mensaxe"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%s\""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nova(s)"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d oculta(s)"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada(s)"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Crear un CartafolV da Busca"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtrar pola Lista de Correo"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Por de_fecto"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obtendo Informaci�n do Cartafol"
@@ -8481,18 +8711,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa ficheiros de Outlook Express 4 a Evolution"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "O corpo cont�n"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formato de armacenamento actual:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "�_ndice"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Formato mailbox"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Novo formato de armacenamento:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8503,15 +8743,15 @@ msgstr ""
 "poida que non sexa recuperable automaticamente. Por favor,\n"
 "use esta caracter�stica con cuidado."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8529,18 +8769,18 @@ msgstr "Editor de Novas de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, 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
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8550,7 +8790,7 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear d�as contas co mesmo nome"
 
@@ -8566,52 +8806,52 @@ msgstr "Desactivar"
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Configuraci�n de Correo"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto � %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8623,7 +8863,7 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8631,7 +8871,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8639,23 +8879,23 @@ msgstr ""
 "Ten que configurar un transporte de correo\n"
 "antes de poder compo�elo."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ning�n m�todo de env�o de correo"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar unha mensaxe"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8663,7 +8903,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8671,11 +8911,11 @@ msgstr ""
 "Xa que a lista de contactos � que env�a est� configurada para agocha-los "
 "enderezos da lista, esta mensaxe s� ha conter destinatarios Bcc."
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8685,41 +8925,41 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 #, fuzzy
 msgid "This message contains invalid recipients:"
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 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:617
+#: mail/mail-callbacks.c:599
 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:850
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 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:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, 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:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8727,7 +8967,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8735,28 +8975,28 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, 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:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8768,11 +9008,11 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8781,19 +9021,19 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8852,16 +9092,16 @@ msgstr ""
 "Este nome s� se emprega para amosalo."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Conta"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8872,16 +9112,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Inbox"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -8899,31 +9139,34 @@ 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:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xesti�n de Contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Contas"
 
-#: 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:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+#, fuzzy
+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:10
-msgid "Always sign outgoing messages when using this account"
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8935,28 +9178,25 @@ msgid "Authentication"
 msgstr "Autenticaci�n"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Tipo de Autenticaci�n: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Comprobando o novo correo"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "ID do certificado:"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Compo�edor"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8972,230 +9212,236 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "O estilo de Remitir por defecto �: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Amosar"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Cartafol de borradores:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Ficheiro de sinatura HTML:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 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:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Lembrar este contrasinal"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Opci�ns de Recepci�n"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Informaci�n Requirida"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Seleccionar un ficheiro de rexistro para o filtro..."
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Cartafol de mensaxes enviadas:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "Cartafol de mensaxes enviadas:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "O servidor require _autenticaci�n"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informaci�n da Fonte"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Cartafoles Especiais"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "Usar conexi�n segura (_SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9205,103 +9451,130 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Tipo de Autenticaci�n: "
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "Dete_ctar tipos soportados "
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Cartafol de borradores:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "_Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "_Rexistrar as acci�ns do filtro a:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organizaci�n:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Ficheiro de _Sinatura:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Cada"
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "descrici�n"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "fiestranovas1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "[gardasitio]"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "segundos."
 
@@ -9341,155 +9614,150 @@ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "O programa GPG/PGP non est� configurado."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "Non se amosa a mensaxe cifrada"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "Mensaxe cifrada"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "Prema na icona para descifrar."
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Non se reco�ece este tipo de compo�ente de axenda."
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 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:1464
+#: mail/mail-format.c:1838
 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:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, 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:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9498,29 +9766,29 @@ msgstr ""
 "Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
 #, 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:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9528,16 +9796,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:1244
+#: mail/mail-local.c:1407
 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:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9546,7 +9814,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9555,26 +9823,7 @@ msgstr ""
 "Erro ao efectuar a operaci�n:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Introduza o seu contrasinal para %s"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Contrasinal"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Traballando"
 
@@ -9582,118 +9831,113 @@ msgstr "Traballando"
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Non se pode copiar un cartafol a si mesmo."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9702,7 +9946,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9711,11 +9955,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9724,17 +9968,17 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
@@ -9743,97 +9987,107 @@ msgstr "Desconectando de %s"
 msgid "_Search"
 msgstr "_Buscar"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Mensaxe Sen T�tulo)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Mensaxes Sen T�tulo"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Mensaxe Baleira"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Buscar na Mensaxe"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Distinguir Mai�sculas"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Buscar Cara a Adiante"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Aparici�ns:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Contrasinal"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
@@ -9843,7 +10097,7 @@ msgstr "Creando o cartafol %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9852,29 +10106,29 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Sen asunto)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
@@ -9935,7 +10189,7 @@ msgstr "O %A �s %k:%M"
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -9961,26 +10215,26 @@ msgstr "Examinando os cartafoles baixo %s en \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel ra�z en \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscrib�ndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -10020,125 +10274,119 @@ msgstr "_Desubscribir"
 msgid "Evolution component for the executive summary."
 msgstr "Compo�ente de Evolution para o resumo executivo"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartafol que cont�n o Resumo de Evolution"
 
-#: 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/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Non hai citas"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "LEVX:LECO:LEST"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 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:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Preferencias do Resumo"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: 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:507
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrici�n:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 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:539
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "Tempo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-#, fuzzy
-msgid "KBOS:EGAA:RJTT"
-msgstr "LEVX:LECO:LEST"
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Rexi�ns"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
 
@@ -10194,7 +10442,7 @@ msgstr "Poucas nubes"
 msgid "Overcast"
 msgstr "Nubrado"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Non v�lido"
 
@@ -10266,1061 +10514,1072 @@ msgstr "Noroeste"
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "Chuvisca"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Chuvisca nas proximidades"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Chuvisca lene"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Chuvisca moderada"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Chuvisca forte"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "Chuvisca superficial"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "Chuviscas espalladas"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Chuvisca parcial"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Treboada"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Chuvisca con ventos"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Chuvieira"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Chuvisca cambiante"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Chuvisca conxelante"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Choiva"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Chuvia nas proximidades"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Chuvia lene"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Chuvia moderada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Chuvia forte"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "Chuvia superficial"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "Chuvia espallada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Chuvia parcial"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Chuvascada con vento"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Chuvia abundante"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Chuvia cambiante"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Chuvia conxelante"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Neve"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Neve nas proximidades"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Neve lene"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Neve moderada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Neve forte"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "Neve superficial"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "Neve espallada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Neve parcial"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Treboada de neve"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Treboada de vento e neve"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Neve abundante"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Neve cambiante"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Neve conxelante"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Folerpas de neve"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Folerpas de neve nas proximidades"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Folerpas de neve lenes"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Folerpas de neve moderadas"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Folerpas de neve fortes"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "Folerpas de neve pouco intensas"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "Folerpas de neve espalladas"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Folerpas de neve parciais"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Folerpas de neve con vento"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Folerpas de neve abundantes"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Folerpas de neve cambiantes"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Folerpas de neve conxelantes"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Cristais de xeo"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Cristais de xeo nas proximidades"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Poucos cristais de xeo"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Cristais de xeo moderados"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr "Moitos cristais de xeo"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr "Cristais de xeo espallados"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr "Cristais de xeo parciais"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Treboada de cristais de xeo"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr "Cristais de xeo con vento"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr "Precipitaci�ns abundantes de cristais de xeo"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr "Cristais de xeo cambiantes"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr "Cristais de xeo conxelantes"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Boli�as de xeo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr "Boli�as de xeo nas proximidades"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr "Poucas boli�as de xeo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr "Boli�as de xeo moderadas"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr "Moitas boli�as de xeo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr "Boli�as de xeo superficiais"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr "Boli�as de xeo espalladas"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr "Boli�as de xeo parciais"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr "Treboada de boli�as de xeo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr "Boli�as de xeo con vento"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr "Precipitaci�ns abundantes de boli�as de xeo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr "Boli�as de xeo cambiantes"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr "Boli�as de xeo conxelantes"
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Pedrisco"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Pedrisco nas proximidades"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Pedrisco lene"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Pedrisco moderado"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Pedrisco forte"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "Pedrisco superficial"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "Pedrisco espallado"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Pedrisco parcial"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Treboada de pedrisco"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Pedrisco con vento"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Precipitaci�ns abundantes de pedrisco"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Pedrisco cambiante"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Pedrisco conxelante"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Sarabia"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Sarabia nas proximidades"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Sarabia moderada"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Sarabia forte"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "Sarabia superficial"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "Sarabia espallada"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Sarabia parcial"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Treboada de sarabia"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Treboada de vento e sarabia"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Precipitaci�ns abundantes de sarabia"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Sarabia cambiante"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Sarabia conxelante"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Precipitaci�n desco�ecida"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Precipitaci�n nas proximidades"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Precipitaci�n lene"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Precipitaci�n moderada"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Precipitaci�n forte"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "Precipitaci�n superficial"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "Precipitaci�ns espalladas"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Precipitaci�n parcial"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Treboada desco�ecida"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Precipitaci�n con vento"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Precipitaci�ns abundantes, tipo desco�ecido"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Precipitaci�n cambiante"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Precipitaci�n conxelante"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Br�tema"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Br�tema nas proximidades"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Br�tema lene"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Br�tema moderada"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "Br�tema espesa"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "Br�tema pouco intensa"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "Br�tema espallada"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Br�tema parcial"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Br�tema con vento"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Br�tema parcial"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Br�tema conxelante"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "N�boa"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "N�boa nas proximidades"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "N�boa lene"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "N�boa moderada"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "N�boa espesa"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "N�boa pouco intensa"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "N�boa espallada"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "N�boa parcial"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "N�boa con vento"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "N�boa cambiante"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "N�boa conxelante"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Fume"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Fume nas proximidades"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Fume lixeiro"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Fume moderado"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "Fume espeso"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "Fume pouco intenso"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "Fume espallado"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Fume parcial"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "Fume con tronos"
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Refachos treboentos de vento"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Fume con vento"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Fume cambiante"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Cinza volc�nica"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Cinza volc�nica nas proximidades"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Cinza volc�nica moderada"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "Cinza volc�nica espesa"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "Cinza volc�nica superficial"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "Cinza volc�nica espallada"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Cinza volc�nica parcial"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr "Cinza volc�nica con tronos"
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Cinza volc�nica espesa"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "Cinza volc�nica con vento"
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
 msgstr "Precipitaci�ns abundantes de cinza volc�nica "
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "Cinza volc�nica cambiante"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "Cinza volc�nica conxelante"
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Area"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "Area nas proximidades"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "Area suave"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "Area moderada"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "Area forte"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "Area espallada"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "Area parcial"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "Area con vento"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "Area cambiante"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "Calixe"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "Calixe nas proximidades"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "Calixe lixeira"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "Calixe moderada"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "Calixe espesa"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "Calixe pouco intensa"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "Calixe espallada"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "Calixe parcial"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "Calixe con vento"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "Calixe cambiante"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "Calixe conxelante"
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
 msgstr "Orballo"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
 msgstr "Orballo nas proximidades"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
 msgstr "Orballo lene"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
 msgstr "Orballo moderado"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
 msgstr "Orballo forte"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
 msgstr "Orballo pouco intenso"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+#, fuzzy
+msgid "Patches of spray"
 msgstr "Orballo espallado"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
 msgstr "Orballo parcial"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
 msgstr "Orballo con vento"
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
 msgstr "Orballo cambiante"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
 msgstr "Orballo conxelante"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Po"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "Po nas proximidades"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "Po suave"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "Po moderado"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "Po forte"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "Po espallado"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "Po parcial"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "Po con vento"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "Po cambiante"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "Refachos de vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "Refachos de vento nas proximidades"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "Refachos lenes de vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "Refachos moderados de vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "Refachos fortes de vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "Refachos de vento espallados"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "Refachos treboentos de vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "Refachos con vento"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "Refachos de vento cambiantes"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "Refachos de vento conxelantes"
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "Treboada de area"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "Treboada de area nas proximidades"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "Treboada de area lene"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "Treboada de area moderada"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "Treboada de area forte"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "Treboada de area superficial"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "Treboada de area parcial"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "Treboada de area con tronos"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "Treboada de area con vento"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "Treboada de area cambiante"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "Treboada de area conxelante"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "Treboada de po"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "Treboada de po nas proximidades"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "Treboada de po lene"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "Treboada de po moderada"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "Treboada de po forte"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "Treboada de po superficial"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "Treboada de po parcial"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "Treboada de po con tronos"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "Treboada de po con vento"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "Treboada de po cambiante"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "Treboada de po conxelante"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr "Nube funil"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr "Nube funil nas proximidades"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr "Nube funil lixeira"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr "Nube funil moderada"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr "Nube funil espesa"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr "Nube funil pouco intensa"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr "Nubes funil espalladas"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr "Nubes funil parciais"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr "Nube funil con vento"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr "Nube funil cambiante"
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Tornado nas proximidades"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Tornado moderado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr "Tornado furioso"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr "Tornado parcial"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr "Tornado treboento"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr "Tornado cambiante"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr "Tornado conxelante"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr "Remu��os de po"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr "Remu��os de po nas proximidades"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr "Remu��os de po lenes"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr "Remu��os de po moderados"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr "Remu��os de po intensos"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr "Remu��os de po pouco intensos"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr "Remu��os de po espallados"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr "Remu��os de po parciais"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr "Remu��os de po con vento"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr "Remu��os de po cambiantes"
 
@@ -11329,7 +11588,8 @@ msgid " _Remove"
 msgstr "_Eliminar"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+#, fuzzy
+msgid "Add n_ews feed"
 msgstr "_Engadir nova fonte"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11344,14 +11604,13 @@ msgstr "T�dolos carta_foles:"
 msgid "All news _feeds:"
 msgstr "T�dalas _fontes de novas:"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "�Cantos d�as deber�an aparecer na axenda ao mesmo tempo?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "M_etric"
-msgstr "m_�tricas"
+msgid "How many days should the calendar display at once?"
+msgstr "�Cantos d�as deber�an aparecer na axenda ao mesmo tempo?"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
@@ -11392,12 +11651,12 @@ msgid "Show _today's tasks"
 msgstr "Amosa-las _tarefas de hoxe"
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "Tarefas "
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr "Unidades: "
+msgid "Tasks "
+msgstr "Tarefas "
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
@@ -11416,13 +11675,12 @@ msgid "_Displayed feeds:"
 msgstr "Fontes _amosadas:"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
-msgstr "_Cinco d�as"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "_Imperial"
-msgstr "_imperiais"
+msgid "_Five days"
+msgstr "_Cinco d�as"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -11456,23 +11714,23 @@ msgstr "Amosa-los Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Entrada"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Sa�da"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11480,16 +11738,16 @@ msgstr ""
 "Esta nova versi�n de Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal de Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para sa�r."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11500,7 +11758,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11509,7 +11767,7 @@ msgstr ""
 "Ocorreu un erro ao copiar ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11520,7 +11778,7 @@ msgstr ""
 "M�vao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11533,7 +11791,7 @@ msgstr ""
 "eliminar antes de executar Evolution.\n"
 "�Quere eliminar este directorio?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11544,6 +11802,19 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
@@ -11556,25 +11827,25 @@ msgstr "Non se pode copiar un cartafol a si mesmo."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, 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:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, 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:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11583,18 +11854,18 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Eliminar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11603,16 +11874,22 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Renomea-lo cartafol '%s'"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "O nome de cartafol indicado non � v�lido: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11622,32 +11899,11 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Non se especificou un nome de cartafol"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "O nome do cartafol non pode conter o car�cter Return."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "O nome do cartafol non pode conte-lo separador de directorios."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' e '..' son nomes de cartafol reservados."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "O nome de cartafol indicado non � v�lido: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11655,19 +11911,19 @@ msgstr ""
 "O tipo do cartafol seleccionado non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11681,13 +11937,13 @@ msgstr ""
 "Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� "
 "averigualo."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11698,7 +11954,7 @@ msgstr ""
 "O importador non est� preparado.\n"
 "Agardando 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11707,16 +11963,16 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11725,11 +11981,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11738,17 +11994,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11757,32 +12013,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, 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
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11790,109 +12046,118 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns existentes"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Pechando as conexi�ns..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
 msgstr ""
 "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
 "%s"
 
-#: 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:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr ""
+"Non se puido inicia-la interface do Mago de Correo de Evolution\n"
+"%s"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Non se especificou un nome de cartafol"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "O nome do cartafol non pode conter o car�cter Return."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Este cartafol non pode conter mensaxes."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' e '..' son nomes de cartafol reservados."
+
+#: shell/e-shell-view-menu.c:165
 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:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, 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:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution � unha suite de aplicaci�ns de traballo\n"
-"en grupo para xesti�n de correo, axenda e contactos\n"
-"dentro do ambiente de escritorio GNOME."
+msgid "About Ximian Evolution"
+msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 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:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, 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"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "_Traballar Desconectado"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -11900,48 +12165,38 @@ msgstr "Traballar Desconectado"
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 #, 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:1640
+#: shell/e-shell-view.c:1630
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 #, 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:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11949,35 +12204,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Aceptar"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11986,111 +12237,111 @@ msgstr ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova _Fiestra"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 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:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Atallos"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12099,64 +12350,170 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 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:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "Erro de E/S"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "Argumentos non v�lidos"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Nada"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Tarxeta non atopada"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Dete_ctar tipos soportados "
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "O usuario cancelou a operaci�n."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Outro erro"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "Existe"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Non v�lido"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Non existe o cartafol %s"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Ningunha Mensaxe Seleccionada"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Erro desco�ecido"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Conexi�ns activas"
@@ -12257,87 +12614,70 @@ msgstr ""
 "Este asistente guiarao no proceso de importaci�n de\n"
 "ficheiros externos a Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Non importar"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
-#: shell/main.c:162
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Ola. Gracias por toma-lo tempo de baixar esta versi�n de avaliaci�n\n"
-"da suite de traballo en grupo Evolution.\n"
-"\n"
-"Evolution a�nda non est� completa. Est� acheg�ndose, pero hai sitios\n"
-"nos que non temos algunhas caracter�sticas, ou est�n a medio facer.\n"
-"\n"
-"Se atopa erros, por favor, inf�rmenos deles en bugzilla.ximian.com\n"
-"Este producto non t�n garant�a e non se pretende que o empreguen\n"
-"individuos propensos a ataques de furia.\n"
-"\n"
-"Esperamos que desfrute do resultado do noso duro traballo, e\n"
-"agardamos con impaciencia polas s�as colaboraci�ns.\n"
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Graci�as\n"
-"O Equipo de Evolution\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:302
+#: shell/main.c:290
 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:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Erro ao cargar o ficheiro: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Abrir ficheiro"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Inserir Ficheiro"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Non se especificou un nome de cartafol"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12427,7 +12767,7 @@ msgstr "Parar a Carga"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Acci�ns"
@@ -12449,7 +12789,7 @@ msgid "_Forward Contact..."
 msgstr "_Remitir Contacto..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimir..."
@@ -12494,7 +12834,7 @@ msgstr "D�a"
 msgid "Delete the appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Ir A"
 
@@ -12617,11 +12957,12 @@ msgstr "Imprimir..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Gardar"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
@@ -12637,7 +12978,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Ficheiro"
@@ -12659,7 +13000,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -12719,10 +13060,6 @@ msgstr "Programar unha xuntanza para este elemento"
 msgid "Customise My Evolution"
 msgstr "Personalizar My Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancela-la operaci�n de correo actual"
@@ -12980,279 +13317,309 @@ msgstr "Crear un cartafol virtual para este autor"
 msgid "Create a virtual folder for this subject"
 msgstr "Crear un cartafol virtual para este asunto"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Amosa-la seguinte mensaxe importante"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Amosa-la seguinte mensaxe"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Amosar o seguinte f�o sen ler"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Amosar a anterior mensaxe importante"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Amosa-la mensaxe anterior"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Amosar a anterior mensaxe sen ler"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo A_utor..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _Destinatarios..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga das imaxes nas mensaxes HTML"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Remitir"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Remitir Coma"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Remitir _Anexo"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Remitir _Inline"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Remitir _Citado"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "Remiti-lo correo seleccionado no corpo dunha nova mensaxe"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "Remiti-lo correo seleccionado citado coma unha resposta"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a algu�n"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Remiti-lo correo seleccionado a algu�n coma un anexo"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Inserir ficheiro de texto..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Cargar _Imaxes"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como Non Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas coma importante"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Seguinte Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Seguinte F�o"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Seguinte Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Anterior Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Anterior Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar as opci�ns de p�xina para a impresora actual"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Amosar o C�digo _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con t�dalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo c�digo fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "_Copiar � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "_Remitir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Buscapersoas"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "_Mover � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "Visualizaci�n _Normal"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -13263,7 +13630,7 @@ msgstr "Pechar esta fiestra"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Pechar"
@@ -13294,11 +13661,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifrar esta mensaxe co seu Certificado de Cifrado S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "_Formato"
+#, fuzzy
+msgid "For_mat"
+msgstr "Formato"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13346,7 +13715,7 @@ msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
@@ -13439,7 +13808,7 @@ msgid "_From Field"
 msgstr "Campo _Desde"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -13455,7 +13824,7 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -13697,10 +14066,6 @@ msgstr "_Atallo"
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "_Traballar Desconectado"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Cambiar as propiedades do resumo"
@@ -13775,132 +14140,136 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o bot�n dereito para alonxarse."
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Hoxe"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "B�ltico"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europeo Central"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chin�s"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cir�lico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grego"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Xapon�s"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turco"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Novo"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Xogo de caracteres desco�ecido: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Outro..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Codificaci�n dos Caracteres"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Gardar Busca"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Engadir �s Buscas Gardadas"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Ver Todos"
 
@@ -13943,18 +14312,195 @@ 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:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): non foi posible inicializar GNOME"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#~ 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"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Notificaci�n da s�a cita que comeza o %s"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Notificaci�n da s�a cita que remata o %s"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Notificaci�n da s�a cita"
+
+#~ 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"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Notificaci�n da s�a tarefa que comeza o %s"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Notificaci�n da s�a tarefa que remata o %s"
+
+#~ msgid "Notification about your task"
+#~ msgstr "Notificaci�n da s�a tarefa"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "un remitente desco�ecido"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Convidar a Outros"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
+
+#~ msgid "<b>Summary:</b> %s<br><br>"
+#~ msgstr "<b>Resumo:</b> %s<br><br>"
+
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "<b>Descrici�n:</b> %s"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Ficheiros de correo con formato maildir de Qmail"
+
+#~ msgid "Summarising folder"
+#~ msgstr "Resumindo cartafol"
+
+#~ 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"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Non � posible resumir o cartafol: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Non foi posible crear a fiestra do compositor."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Tarxeta: "
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "O programa GPG/PGP non est� configurado."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Non se amosa a mensaxe cifrada"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Mensaxe cifrada"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Prema na icona para descifrar."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Non se pode copiar un cartafol a si mesmo."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Non se pode inicializar o compo�ente de Resumo Executivo de Evolution."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "LEVX:LECO:LEST"
+
+#, fuzzy
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "LEVX:LECO:LEST"
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "Fume con tronos"
+
+#~ msgid "Volcanic ash w/ thunders"
+#~ msgstr "Cinza volc�nica con tronos"
+
+#, fuzzy
+#~ msgid "M_etric"
+#~ msgstr "m_�tricas"
+
+#~ msgid "Units: "
+#~ msgstr "Unidades: "
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "_imperiais"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "O nome do cartafol non pode conte-lo separador de directorios."
+
+#~ msgid "Cannot initialize the Evolution Mailer Wizard interface"
+#~ msgstr "Non se pode inicializar a interface do Mago do Correo de Evolution."
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution � unha suite de aplicaci�ns de traballo\n"
+#~ "en grupo para xesti�n de correo, axenda e contactos\n"
+#~ "dentro do ambiente de escritorio GNOME."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Ola. Gracias por toma-lo tempo de baixar esta versi�n de avaliaci�n\n"
+#~ "da suite de traballo en grupo Evolution.\n"
+#~ "\n"
+#~ "Evolution a�nda non est� completa. Est� acheg�ndose, pero hai sitios\n"
+#~ "nos que non temos algunhas caracter�sticas, ou est�n a medio facer.\n"
+#~ "\n"
+#~ "Se atopa erros, por favor, inf�rmenos deles en bugzilla.ximian.com\n"
+#~ "Este producto non t�n garant�a e non se pretende que o empreguen\n"
+#~ "individuos propensos a ataques de furia.\n"
+#~ "\n"
+#~ "Esperamos que desfrute do resultado do noso duro traballo, e\n"
+#~ "agardamos con impaciencia polas s�as colaboraci�ns.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Graci�as\n"
+#~ "O Equipo de Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "_Formato"
+
 #~ 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"
 
@@ -14149,18 +14695,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "Elm mail"
 #~ msgstr "Correo de Elm"
 
 #~ msgid "Pine mail"
 #~ msgstr "Correo de Pine"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "F�brica para o compo�ente de correo de Evolution."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Mensaxe remitida:\n"
 
@@ -14340,9 +14880,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Select name from:"
 #~ msgstr "Seleccionar nome dende:"
 
-#~ msgid "Open calendar"
-#~ msgstr "Abrir axenda"
-
 #~ msgid "Save calendar"
 #~ msgstr "Gardar axenda"
 
@@ -14415,12 +14952,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Edit Task"
 #~ msgstr "Editar Tarefa"
 
-#~ msgid "Task"
-#~ msgstr "Tarefa"
-
-#~ msgid "Percent complete"
-#~ msgstr "Porcentaxe completada"
-
 #~ msgid "Transparency"
 #~ msgstr "Transparencia"
 
@@ -14454,15 +14985,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Compo�ente borrado con �xito."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Non se reco�ece este tipo de compo�ente de axenda."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Engadir � Axenda"
 
-#~ msgid " Tentative "
-#~ msgstr " Tentativa "
-
 #~ msgid "Update Calendar"
 #~ msgstr "Actualizar Axenda"
 
@@ -14996,8 +15521,5 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Using the _Mailer"
 #~ msgstr "Uso do Cliente de _Correo"
 
-#~ msgid "_Index"
-#~ msgstr "�_ndice"
-
 #~ msgid "Advanced ..."
 #~ msgstr "Avanzadas..."
diff --git a/po/hu.po b/po/hu.po
index d830adf392..a0f89ea5ba 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-10-15 11:00+0200\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-15 14:41+0200\n"
 "Last-Translator: Andr�s T�m�r <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Factory a VCard f�jlok Evol�ci�ba import�l�s�hoz"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "VCard f�jlok import�l�sa az Evol�ci�ba."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory a VCard f�jlok Evol�ci�ba import�l�s�hoz"
@@ -21,291 +31,296 @@ msgstr "Factory a VCard f�jlok Evol�ci�ba import�l�s�hoz"
 msgid "Imports VCard files into Evolution."
 msgstr "VCard f�jlok import�l�sa az Evol�ci�ba."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "T�rol�s mint"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "N�v"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Els�dleges"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Els�d"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Asszisztens"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "�zleti"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Fogl"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Visszah�v�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "V�llalat"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "V�ll"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Otthoni"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Szervezet"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Szerv"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Aut�"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "�zleti fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "�zl fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "2. �zleti"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "2. �zl"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "2. Otthoni"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: mail/mail-config.glade.h:52
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "M�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Egy�b fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Szem�lyh�v�"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "R�di�"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "2. email"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "3. email"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Webhely"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Oszt�ly"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Oszt"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Hivatal"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Hiv"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Beoszt�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Foglalkoz�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Beoszt"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "F�n�k"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "F�n"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Assz"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Becen�v"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Bece"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "H�zast�rs"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Megjegyz�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Napt�r URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Szabad-foglalt URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "SzFURL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "�vfordul�"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "�vf"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Sz�let�si d�tum"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kateg�ri�k"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Csal�di n�v"
 
-#: addressbook/backend/ebook/e-card.c:3620
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "K�rtya:"
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +328,7 @@ msgstr ""
 "\n"
 "N�v:  "
 
-#: addressbook/backend/ebook/e-card.c:3623
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,7 +336,7 @@ msgstr ""
 "\n"
 " El�tag:      "
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -329,7 +344,7 @@ msgstr ""
 "\n"
 "  Adott:      "
 
-#: addressbook/backend/ebook/e-card.c:3625
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 "  Egy�b:      "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 "  Csal�di:    "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "  Ut�tag:     "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "Sz�let�si d�tum: "
 
-#: addressbook/backend/ebook/e-card.c:3652
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "C�m:"
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,7 +392,7 @@ msgstr ""
 "\n"
 "  Postafi�k:   "
 
-#: addressbook/backend/ebook/e-card.c:3655
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -385,7 +400,7 @@ msgstr ""
 "\n"
 " K�l:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -393,7 +408,7 @@ msgstr ""
 "\n"
 "  �t:          "
 
-#: addressbook/backend/ebook/e-card.c:3657
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -401,7 +416,7 @@ msgstr ""
 "\n"
 "  V�ros:       "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -409,7 +424,7 @@ msgstr ""
 "\n"
 "  R�gi�:       "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -417,7 +432,7 @@ msgstr ""
 "\n"
 " Ir�ny�t�sz�m: "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -425,7 +440,7 @@ msgstr ""
 "\n"
 "  Orsz�g:      "
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -433,7 +448,7 @@ msgstr ""
 "\n"
 "K�zbes�t� c�mke: "
 
-#: addressbook/backend/ebook/e-card.c:3685
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -441,7 +456,7 @@ msgstr ""
 "\n"
 "Telefonok:\n"
 
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -449,7 +464,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -457,7 +472,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -465,7 +480,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -473,7 +488,7 @@ msgstr ""
 "\n"
 "Levelez�: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -481,7 +496,7 @@ msgstr ""
 "\n"
 "Id�z�na: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -489,7 +504,7 @@ msgstr ""
 "\n"
 "Hely: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -497,7 +512,7 @@ msgstr ""
 "\n"
 "�zleti szab�ly:"
 
-#: addressbook/backend/ebook/e-card.c:3764
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -505,7 +520,7 @@ msgstr ""
 "\n"
 "C�g:"
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -513,7 +528,7 @@ msgstr ""
 "\n"
 " N�v:"
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -521,7 +536,7 @@ msgstr ""
 "\n"
 " Egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3767
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -529,7 +544,7 @@ msgstr ""
 "\n"
 " 2. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -537,7 +552,7 @@ msgstr ""
 "\n"
 " 3. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -545,7 +560,7 @@ msgstr ""
 "\n"
 " 4. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -553,7 +568,7 @@ msgstr ""
 "\n"
 "Kateg�ri�k:"
 
-#: addressbook/backend/ebook/e-card.c:3774
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -571,7 +586,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3787
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -579,7 +594,7 @@ msgstr ""
 "\n"
 "Egyedi sz�veg:"
 
-#: addressbook/backend/ebook/e-card.c:3790
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -587,11 +602,11 @@ msgstr ""
 "\n"
 "Nyilv�nos kulcs:"
 
-#: addressbook/backend/ebook/e-card.c:4143
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "T�bb VK�rtya"
 
-#: addressbook/backend/ebook/e-card.c:4151
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VK�rty�ja"
@@ -600,82 +615,84 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Keres�s..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "Bet�lt�s..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "Hiba a keres�si kifejez�sben."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Kapcsol�d�s az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Nem siker�lt kapcsolatba l�pni az LDAP-kiszolg�l�val."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "V�rakoz�s a kapcsol�d�sra az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "N�vjegy hozz�ad�sa az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "N�vjegy elt�vol�t�sa az LDAP-kiszolg�l�r�k..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem lehet bet�lteni\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Nem siker�lt elind�tani a wombat kiszolg�l�t"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Nem siker�lt a wombatot elind�tani"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Nem siker�lt a pilot Address application blokkj�t olvasni"
 
@@ -719,39 +736,39 @@ msgstr "Factory a C�mjegyz�k el�ugr� c�meihez"
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory a minta c�mjegyz�k kontrollhoz"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "N�vjegyek"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "N�vjegyeket tartalmaz� mappa"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "N�vjegyeket tartalmaz� LDAP-kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "�j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "�_j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "�j c�mlista"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "�j _c�mlista"
 
@@ -784,7 +801,7 @@ msgid "Base"
 msgstr "Alap"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Egyszer�"
 
@@ -870,16 +887,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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
@@ -896,15 +913,20 @@ msgstr "_Port:"
 msgid "_Server name:"
 msgstr "_Kiszolg�l� neve:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Egy�b c�mt�rak"
 
-#: addressbook/gui/component/addressbook.c:460
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nem siker�lt megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook.c:469
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +936,7 @@ msgstr ""
 "jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
 "kiszolg�l� nem m�k�dik."
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -926,7 +948,7 @@ msgstr ""
 "a CVS forr�sb�l kell leford�tanod a programot, miut�n let�lt�tted\n"
 "az OpenLDAP-t az al�bbi helyr�l.\n"
 
-#: addressbook/gui/component/addressbook.c:482
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -934,42 +956,42 @@ msgstr ""
 "Nem siker�lt megnyitni a c�mjegyz�ket. Ellen�rizd, hogy az �tvonal\n"
 "l�tezik-e �s van-e jogod az el�r�s�hez."
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�rd be %s jelszav�t (%s felhaszn�l�)"
 
-#: addressbook/gui/component/addressbook.c:720
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:721
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "A n�v tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:722
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "Az emailc�m tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:723
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kateg�ria"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:724 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Halad�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:955
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "B�rmelyik kateg�ria"
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
 
@@ -982,51 +1004,51 @@ msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
 msgid "(none)"
 msgstr "(semmi)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Els�dleges email"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "V�lassz egy m�veletet"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "�j n�vjegy k�sz�t�se: %s"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "C�m hozz�ad�sa a l�tez� %s n�vjegyjez"
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "A c�mjegyz�k lek�rdez�se..."
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "N�vjegy adatainak szerkeszt�se"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Hozz�ad�s a n�vjegyalbumhoz"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Email c�m �sszef�s�l�se"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Lek�rdez�sek tilt�sa"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Lek�rdez�sek enged�lyez�se (Vesz�lyes!)"
 
@@ -1038,39 +1060,39 @@ msgstr "Evol�ci� c�mjegyz�k n�vkiv�laszt� fel�lete."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory a c�mjegyz�k n�vkiv�laszt� fel�let�hez"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:758
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "T�rl�s"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Mindet t�rli"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "HTML lev�l k�ld�se?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "C�mlista szerkeszt�se"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "N�vtelen c�mlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nincs mutatva)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "N�vtelen n�vjegy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:516
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1080,7 +1102,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:594
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "N�vjegyek kijel�l�se a c�mjegyz�kb�l"
 
@@ -1141,12 +1171,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "N�vjegy szerkeszt�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "R�szletek"
 
@@ -1213,9 +1243,9 @@ 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:843 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_T�rl�s"
@@ -1284,37 +1314,47 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Ez a n�vjegy az al�bbi kateg�ri�khoz tartozik:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nem tal�lhat� widget a mez�h�z: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Gyors n�vjegyhozz�ad�s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "R�szletes szerkeszt�s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Teljes n�v"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "K�d"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2381,7 +2421,7 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "C�mlista-szerkeszt�"
 
@@ -2430,13 +2470,13 @@ msgstr ""
 "A megv�ltoztatott n�v vagy emailc�m m�r szerepel a\n"
 "c�mjegyz�kben. Mindenk�ppen hozz�adod?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Halad� keres�s"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Keres�s"
 
@@ -2453,126 +2493,133 @@ msgstr "1 k�rtya"
 msgid "%d cards"
 msgstr "%d k�rtya"
 
-#: 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:699
-#: addressbook/gui/widgets/e-addressbook-view.c:761
-#: addressbook/gui/widgets/e-addressbook-view.c:1433
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ment�s VCard-k�nt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Megnyit�s"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "N�vjegy tov�bb�t�sa"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Lev�l k�ld�se ennek a szem�lynek"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:764
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Nyomtat�s"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:766
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Bor�t�k nyomtat�sa"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:768 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "T�rl�s"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Hiba a k�rtya m�dos�t�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 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:1732
-#: shell/e-storage.c:529
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Kapcsolat n�lk�li t�rol�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "A k�rtya nem tal�lhat�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "A k�rtyaazonos�t� m�r l�tezik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 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
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Megszak�tva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Egy�b hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Mented a v�ltoztat�sokat?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Hiba a lista hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Hiba a k�rtya hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Hiba a lista m�dos�t�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Hiba a lista t�rl�sekor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1306
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Hiba a k�rtya t�rl�sekor"
 
 #. 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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,a�,b,c,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,"
@@ -2582,77 +2629,86 @@ msgstr ""
 #. 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,a�,b,c,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,x,"
 "y,z,zs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Kattints ide n�vjegy hozz�ad�s�hoz *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Els�dleges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Asszisztens telefonja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Visszah�v� telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "C�ges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Munkahelyi c�m"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Otthoni c�m"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Aut�telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Egy�b telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Egy�b c�m"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Ment�s a c�mjegyz�kbe"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2838,94 +2894,109 @@ msgstr "Sz�less�g:"
 msgid "_Font..."
 msgstr "_Bet�k�szlet..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "N�vjegyek nyomtat�sa"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "N�vjegy nyomtat�sa"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Bor�t�k nyomtat�sa"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Tal�lkoz� szerkeszt�se"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Magas"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Norm�lis"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Alacsony"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 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:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem siker�lt a pilot Calendar ToDo blokkj�t olvasni"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Egy minta Bonono kontroll, amely napt�rat jelen�t meg."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Egy minta Bonono kontroll, amely napt�rat jelen�t meg."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evol�ci� napt�r vezet�i �sszefoglal� komponense."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evol�ci� napt�r iTip/iMip n�z�ke"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Evol�ci� �sszetev� a napt�rkezel�shez."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory a napt�r �sszefoglal� komponens�hez."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Factory az Evol�ci� levelez�komponens sz�m�ra."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory a napt�r iTip n�z� kontrollj�hoz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Factory a mintanapt�r kontrollhoz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Factory a napt�rkomponens komponensablakainak �sszefog�s�ra"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Factory a komponensszerkeszt� factory l�trehoz�s�ra"
 
@@ -2937,48 +3008,30 @@ 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: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: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: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:165
-msgid "Notification about your appointment"
-msgstr "Figyelmeztet�s a tal�lkoz�ra"
-
-#: 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Be�ll�t�sok"
 
-#: 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:218
+#, fuzzy
+msgid "Ending:"
+msgstr "_T�rgymutat�"
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "_Befejez�s id�pontja:"
 
-#: 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:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evol�ci�"
 
-#: 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"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "�breszt�k"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -2997,11 +3050,11 @@ msgstr "Szundi id� (percek)"
 msgid "_Edit appointment"
 msgstr "_Tal�lkoz� szerkeszt�se"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Nincs le�r�s."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3009,7 +3062,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3020,137 +3073,116 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nem siker�lt a GNOME inicializ�l�sa"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Nem siker�lt l�trehozni az riaszt� szolg�ltat�s factoryj�t"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem siker�lt l�trehozni az riaszt� szolg�ltat�s factoryj�t"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d, %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nem siker�lt l�trehozni a napt�rn�zetet. Ellen�rizd az ORBit �s OAF "
 "telep�t�sedet."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Szem�lyes"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Nyilv�nos"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Szabad"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Foglalt"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "K�sz"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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 %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"A d�tumot a k�vetkez� form�ban tudod be�rni: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3160,53 +3192,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-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:331
-#: 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
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Ism�tl�d�"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nem"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Keres�s..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Napn�zet"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Munkah�tn�zet"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "H�tn�zet"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "H�napn�zet"
 
@@ -3222,12 +3257,12 @@ msgstr "Le�r�s tartalmazza"
 msgid "Comment contains"
 msgstr "Megjegyz�s tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Ki nem v�logatott"
 
 #: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Napt�r"
 
@@ -3235,9 +3270,9 @@ 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:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Feladatok"
@@ -3246,24 +3281,24 @@ msgstr "Feladatok"
 msgid "Folder containing to-do items"
 msgstr "Teend�ket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "�j _tal�lkoz�"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "�j _feladat"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a napt�r megjelen�t"
 
@@ -3333,115 +3368,110 @@ msgstr "�r�nk�nt"
 msgid "minutes"
 msgstr "percenk�nt"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d nappal"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 nappal"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d h�t"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 h�t"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d �r�val"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 �r�val"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d perccel"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 perccel"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d m�sodperc"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 m�sodperc"
 
-#: calendar/gui/dialogs/alarm-page.c:371
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Hangjelz�s"
 
-#: calendar/gui/dialogs/alarm-page.c:375
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Lev�l megjelen�t�se"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Lev�l k�ld�se"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Program futtat�sa"
 
-#: calendar/gui/dialogs/alarm-page.c:389
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Ismeretlen m�veletet k�sz�lsz v�grehajtani"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s a tal�lkoz� kezdete el�tt"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s a tal�lkoz� kezdete ut�n"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s a tal�lkoz� kezdetekor"
 
-#: calendar/gui/dialogs/alarm-page.c:418
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s a tal�lkoz� v�ge el�tt"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s a tal�lkoz� v�ge ut�n"
 
-#: calendar/gui/dialogs/alarm-page.c:426
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s a tal�lkoz� v�g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at an unknown time"
-msgstr "%s ismeretlen id�pontban"
-
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s-kor"
 
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiv�lt� okra"
@@ -3462,7 +3492,7 @@ msgstr "Eml�keztet�k"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:683 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�sszefoglal�:"
 
@@ -3492,7 +3522,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "perc"
 
@@ -3545,7 +3575,7 @@ msgid "First day of wee_k:"
 msgstr "A _h�t els� napja:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "P�ntek"
 
@@ -3558,7 +3588,7 @@ msgid "Minutes"
 msgstr "perc m�lva"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "H�tf�"
 
@@ -3567,7 +3597,7 @@ msgid "O_verdue tasks:"
 msgstr "_Lej�rt hat�ridej� feladatok:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -3588,7 +3618,7 @@ msgid "Su_n"
 msgstr "_V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Vas�rnap"
 
@@ -3605,7 +3635,7 @@ msgid "Tas_ks due today:"
 msgstr "M_ai hat�ridej� feladatok:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Cs�t�rt�k"
 
@@ -3626,12 +3656,12 @@ msgid "Time format:"
 msgstr "Id�form�tum:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Kedd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -3700,117 +3730,122 @@ msgstr "_Sze"
 msgid "before the start of the appointment"
 msgstr "a tal�lkoz� kezdete el�tt"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 "Az �rtekezlet �llapota megv�ltozott. K�ldesz egy friss�tett v�ltozatot?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "T�nyleg t�r�lni akarod ezt az �rtekezletet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "T�nyleg t�r�lni akarod ezt a feladatot?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "T�nyleg t�r�lni akarod ezt a napl�bejegyz�st?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Az esem�ny t�rl�d�tt."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "A feladat t�rl�d�tt."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "A napl�bejegyz�s t�rl�d�tt."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  V�ltoztatt�l. Elveted a v�ltoztat�sokat �s bez�rod a szerkeszt�t?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Nem v�ltoztatt�l, bez�rod a szerkeszt�t?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Az esem�ny megv�ltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "A feladat megv�ltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "A napl�bejegyz�s megv�ltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  V�ltoztatt�l. Elveted a v�ltoz�sokat �s friss�ted a szerkeszt�t?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " - "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (K�sz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "K�sz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor.c:630
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Nem siker�lt rendesen friss�teni a f�jlokat."
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Megbesz�l�s szerkeszt�se"
 
-#: calendar/gui/dialogs/comp-editor.c:635
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:638
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:641
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:655
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1764
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1771
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3818,53 +3853,53 @@ msgstr ""
 "A megadott n�ven m�r l�tezik f�jl.\n"
 "Fel�l�rod?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "T�nyleg t�r�lni akarod ezt a tal�lkoz�t: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "T�nyleg t�r�lni akarod ezt a n�vtelen tal�lkoz�t?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "T�nyleg t�r�lni akarod ezt a feladatot: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "T�nyleg t�r�lni akarod ezt a n�vtelen feladatot?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "T�nyleg t�r�lni akarod ezt a napl�bejegyz�st: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "T�nyleg t�r�lni akarod ezt a n�vtelen napl�bejegyz�st?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "T�nyleg t�r�lni akarsz %d tal�lkoz�t?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "T�nyleg t�r�lni akarsz %d feladatot?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "T�nyleg t�r�lni akarsz %d napl�bejegyz�st?"
@@ -3881,25 +3916,25 @@ msgstr "A feladat v�grehajt�ja:"
 msgid "Enter Delegate"
 msgstr "V�grehajt� megad�sa"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Tal�lkoz�"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Eml�keztet�"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Ism�tl�d�s"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "�temez�s"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "�rtekezlet"
 
@@ -3918,11 +3953,12 @@ msgid "Classification"
 msgstr "Besorol�s"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Bi_zalmas"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "D�tum �s id�"
 
@@ -3931,12 +3967,12 @@ msgid "F_ree"
 msgstr "S_zabad"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Szem�_lyes"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Nyil_v�nos"
 
@@ -3946,7 +3982,7 @@ msgid "Show Time As"
 msgstr "Id�form�tum"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "�_sszegz�s:"
 
@@ -3958,36 +3994,20 @@ msgstr "_Befejez�s id�pontja:"
 msgid "_Start time:"
 msgstr "_Kezd�s id�pontja:"
 
-#: calendar/gui/dialogs/meeting-page.c:442
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:590
-msgid "Chair Persons"
-msgstr "Eln�k"
-
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:711
-msgid "Required Participants"
-msgstr "Sz�ks�ges r�sztvev�k"
-
-#: calendar/gui/dialogs/meeting-page.c:559
-#: calendar/gui/dialogs/meeting-page.c:590
-msgid "Optional Participants"
-msgstr "Esetleges r�sztvev�k"
-
-#: calendar/gui/dialogs/meeting-page.c:561
-#: calendar/gui/dialogs/meeting-page.c:590
-msgid "Non-Participants"
-msgstr "Nem vesz r�szt"
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Ez a szem�ly m�r rajta van a r�sztvev�k list�j�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Feladatkiad�s..."
 
@@ -4027,6 +4047,7 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4045,7 +4066,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T�pus"
@@ -4060,36 +4081,37 @@ msgid "_Change Organizer"
 msgstr "_Szervez� megv�ltoztat�sa"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_M�sok megh�v�sa"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_M�sok megh�v�sa..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_M�sik szervez�"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ez a tal�lkoz� olyan ism�tl�d�seket tartalmaz, amelyeket az Evol�ci� nem tud "
 "szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
@@ -4153,19 +4175,15 @@ msgstr "h�ten"
 msgid "year(s)"
 msgstr "�vben"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Mented a v�ltoztat�sokat?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Az �rtekezlet adatai megv�ltoztak. K�ldesz egy friss�tett v�ltozatot?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "A feladat adatai megv�ltoztak. K�ldesz egy friss�tett v�ltozatot?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "A napl�bejegyz�s megv�ltozott. K�ldesz egy friss�tett v�ltozatot?"
 
@@ -4184,7 +4202,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4196,138 +4214,169 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "�ll_apot:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Kioszt�s"
 
-#: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Le�r�s:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Ke_zd�s d�tuma:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Bizalmas"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Le_j�rat:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Kijel�lt n�vjegyek t�rl�se"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Megnyit�s"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_iv�g�s"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_M�sol�s"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "_Beilleszt�s"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Megjel�l�s k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "A _feladat t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Feladatok megjel�l�se k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Kijel�lt feladatok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d %a %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"A d�tumot a k�vetkez� form�ban tudod be�rni: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "K�sz"
 
@@ -4358,8 +4407,8 @@ msgstr "Kezd�s d�tuma"
 #. 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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "�sszefoglal�"
 
@@ -4371,335 +4420,392 @@ msgstr "Feladatrendez�s"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "�_j eg�sz napos esem�ny"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ugr�s a _mai napra"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Ugr�s d�tumra..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "A _tal�lkoz� t�rl�se"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Az el�fordul�s _mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Az _el�fordul�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Az �_sszes el�fordul�s t�rl�se"
 
-#: calendar/gui/e-itip-control.c:473
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "�rtekezlet kezdete: <b>"
 
-#: calendar/gui/e-itip-control.c:478
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "Feladat kezdete: <b>"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Szabad/foglalt inform�ci� kezdete: <b>"
 
-#: calendar/gui/e-itip-control.c:487
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Kezd�dik: <b>"
 
-#: calendar/gui/e-itip-control.c:500
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "Megbesz�l�s v�ge: <b>"
 
-#: calendar/gui/e-itip-control.c:503
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Szabad/foglalt inform�ci� v�ge: <b>"
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "V�ge: <b>"
 
-#: calendar/gui/e-itip-control.c:519
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "A feladat befejezve: <b> "
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "A feladat hat�rideje: <b>"
 
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "napt�rinform�ci�"
+
 #. Title
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "iNapt�r hiba"
 
-#: calendar/gui/e-itip-control.c:644 calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "Ismeretlen szem�ly"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Olvasd el a k�vetkez�ket, �s v�lassz ki egy m�veletet az al�bbi men�b�l."
 
-#: calendar/gui/e-itip-control.c:683
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "V�lassz egy m�veletet"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Feladat friss�t�se"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Elfogadva"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " K�s�rleti "
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Elutas�tva"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Szabad/foglalt inform�ci�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Feladatinform�ci�"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "M�gse"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> inform�ci�t tett k�zz� az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Inform�ci� az �rtekezletr�l"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> arra k�r, hogy vegy�l r�szt az �rtekezleten."
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Javaslat �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� �rtekezlethez."
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "�rtekezlet friss�t�se"
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "�rtekezletfriss�t�si k�r�s"
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> v�laszolt egy �rtekezlet-�sszeh�v�si k�r�sre."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "V�lasz az �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az �rtekezletet."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "�rtekezlet lemond�sa"
 
-#: calendar/gui/e-itip-control.c:755 calendar/gui/e-itip-control.c:803
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> egy �rtelmetlen levelet k�ld�tt."
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Rossz �rtekezletfelh�v�s"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> feladatinform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> arra k�r, hogy hajts v�gre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� feladathoz."
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Feladat friss�t�se"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat a feladatr�l."
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Feladatfriss�t�si felh�v�s"
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> v�laszolt egy feladatfelk�r�sre."
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "V�lasz feladatra"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> t�r�lte a feladatot."
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Feladat lemond�sa"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Rossz feladat�zenet"
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> szabad/foglalt inform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> k�ri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt k�r�s"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> v�laszolt egy szabad/foglalt k�r�sre."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt v�lasz"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt �zenet"
 
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "A lev�l �gy t�nik, nem megfelel�en form�zott"
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "A lev�l csak nem t�mogatott k�r�seket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "A mell�klet nem tartalmaz �rv�nyes napt�r�zenetet"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "A napt�rf�jlt nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Friss�t�s k�sz\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az �llapot �rv�nytelen!\n"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "A r�sztvev� �llapot�t nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "A r�sztvev� �llapota friss�tve\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nem siker�lt elt�vol�tani az elemet a napt�rf�jlodb�l!\n"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "T�rl�s befejezve"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Elk�ldve!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elk�ldeni!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Nem tal�lom egyik azonos�t�dat sem a r�sztvev�k list�j�n!\n"
 
@@ -4740,193 +4846,215 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Eln�k"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Sz�ks�ges r�sztvev�k"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Esetleges r�sztvev�k"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Nem vesz r�szt"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Egy�n"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Csoport"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Er�forr�s"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Szoba"
 
-#: 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:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Levezet�"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Sz�ks�ges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Esetleges r�sztvev�"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Nem vesz r�szt"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Beavatkoz�s sz�ks�ges"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Elutas�tva"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "K�s�rleti"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Deleg�lt"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Folyamatban"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Nincs bent"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Nincs inform�ci�"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_M�sok megh�v�sa..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Be�ll�t�sok"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Csak a _munka�r�k mutat�sa"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "_Nagy�tott mutat�sa"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Szabad/foglalt friss�t�se"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Automatikus kiszed�s"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Minden ember �s er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Minden _ember �s egy er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_A k�rt emberek"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "A k�rt emberek �s egy e_r�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Megbesz�l�s _kezd�dik:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "%s t�rol� megnyit�sa"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nem siker�lt bet�lteni a feladatot %s-be."
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "�j _tal�lkoz�..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyit�s�hoz sz�ks�ges elj�r�s nem t�mogatott"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Napt�r megnyit�sa"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "�prilis"
@@ -4983,230 +5111,274 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Nem siker�lt l�trehozni a komponensszerkeszt� factoryt"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "V"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Szo"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Kijel�lt nap (%Y %b %d, %a)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%b %d, %a"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%Y %d, %a"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Kijel�lt h�t (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Kijel�lt h�nap (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Kijel�lt �v (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Feladat"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "�ll_apot:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorit�s:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Sz�zal�kos k�szenl�t"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kateg�ri�k:"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_N�vjegyek:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2180 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Elem nyomtat�sa"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Nyomtat�si be�ll�t�sok"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelen�tend� feladatmappa URI-ja"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Nem siker�lt l�trehozni a napt�rn�zetet. Ellen�rizd az ORBit �s OAF "
+"telep�t�sedet."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5214,7 +5386,7 @@ msgstr ""
 "Az Evol�ci� kivette a napt�radban l�v� feladatokat, �s automatikusan az �j "
 "feladatok mapp�j�ba mozgatta."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5226,7 +5398,7 @@ msgstr ""
 "N�h�ny feladatot nem lehetett �tmozgatni, ez�rt a folyamatot a k�s�bbiekben "
 "�jra meg lehet k�s�relni."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5235,7 +5407,7 @@ msgstr ""
 "Nem siker�lt megnyitni '%s'-t, a egyetlen napt�rmappa-elemet sem lehet "
 "�tmozgatni a feladatok mapp�j�ba."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5244,85 +5416,85 @@ msgstr ""
 "'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott, egyetlen napt�rmappa-"
 "elemet sem lehet �tmozgatni a feladatok mapp�j�ba."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "VHKSCPS"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "a time-now 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "a make-time 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "a make-time els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "a make-time els� argumentum�nak ISO 8601 d�tum/id� karakterl�ncnak kell "
 "lennie"
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "a time-add-day 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "a time-day-add els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "a time-add-day m�sodik argumentumak�nt eg�sz sz�mot v�r"
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "a time-day-begin 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "a time-day-begin els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "a time-day-end 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "a time-day-end els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "a get-vtype 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "az occur-in-time-range? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "az occur-in-time-range? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "az occur-in-time-range? m�sodik argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "a contains? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "a contains? els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "a contains? m�sodik argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5330,11 +5502,11 @@ msgstr ""
 "a contains? els� argumentumak�nt a k�vetkez�k egyik�t v�rja: \"any\", "
 "\"summary\", \"description\""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "a has-categories? legal�bb egy argumentumot v�r"
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5342,19 +5514,19 @@ msgstr ""
 "a has-categories? minden argumentumak�nt karakterl�ncot v�r, vagy csak "
 "egyetlen logikai hamis (#f) �rt�ket"
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "az is-completed? 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "a completed-before? 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "a completed-before? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A keres�si kifejez�s ki�rt�kel�se nem logikai �rt�kre vezetett"
 
@@ -5378,7 +5550,7 @@ msgstr "Ez a titkos�t� nem t�mogatja a titkos�t�st"
 msgid "Decryption is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja a visszafejt�st"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5389,7 +5561,7 @@ msgstr ""
 "A tov�bbi m�veletek ezen a kiszolg�l�n nem lesznek �jra lej�tszva,\n"
 "amikor ism�t kapcsol�dsz a h�l�zathoz."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5400,93 +5572,93 @@ msgstr ""
 "%s\n"
 "Az ebben a mapp�ban t�rt�nt v�ltoz�sok nem lesznek �jraszinkroniz�lva."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "�jraszinkroniz�l�s a kiszolg�l�val"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Mapp�k szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Nem siker�lt megnyitni spool mapp�t"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Nem siker�lt feldolgozni a spool mapp�t"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. lev�l let�lt�se (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d. lev�l rossz"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Mappa szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek let�lt�se: %d/%d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a sz�r� feldolgoz�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a sz�rt keres�s v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Hiba a keres�si kifejez�s v�grehajt�sa k�zben: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Hiba a keres�si kifejez�s v�grehajt�sa k�zben: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Levelek �thelyz�se"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5495,7 +5667,7 @@ msgstr ""
 "Nem siker�lt �rtelmezni a keres�kifejez�st:  %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5504,7 +5676,7 @@ msgstr ""
 "Hiba a keres�si kifejez�s v�grehajt�sa k�zben: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "a (match-all) egy darab logikai eredm�nyt v�r"
 
@@ -5513,195 +5685,195 @@ msgstr "a (match-all) egy darab logikai eredm�nyt v�r"
 msgid "Performing query on unknown header: %s"
 msgstr "Lek�rdez�s futtat�sa ismeretlen fejl�cen: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "�rv�nytelen t�pus a body-contains kifejez�sben, a v�rt karakterl�nc"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nem siker�lt fel�p�teni a z�rol� seg�dcs�vezet�ket: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Nem siker�lt forkolni a z�rol� seg�det: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Nem siker�lt '%s' z�rol�sa: seg�dz�rol� protokollhiba"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nem siker�lt a z�rol�s: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nem siker�lt z�rol�f�jlt l�trehozni %s sz�m�ra: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Id�t�ll�p�s %s f�jl z�rol�si k�s�rlete k�zben. Pr�b�ld k�s�bb."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Sikertelen z�rol�s az fcntl(2) haszn�lat�val: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Sikertelen z�rol�s az flock(2) haszn�lat�val: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nem siker�lt ellen�rizni ezt a lev�lf�jlt: %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nem siker�lt megnyitni ezt a lev�lf�jlt: %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nem siker�lt megnyitni ezt az ideiglenes lev�lf�jlt: %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nem siker�lt a levelet ebben az ideiglenes f�jlban t�rolni: %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nem siker�lt cs�vezet�ket l�trehozni: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nem siker�lt a fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "A movemail program sikertelen: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Ismeretlen hiba)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Hiba a lev�lf�jl olvas�sa k�zben: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Hiba az ideiglenes lev�lf�jl �r�sa k�zben: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Hiba az ideiglenes lev�lf�jl m�sol�sa k�zben: %s"
 
-#: camel/camel-pgp-context.c:192
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Add meg %s jelszavadat %s sz�m�ra"
 
-#: camel/camel-pgp-context.c:195
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Add meg %s jelszavadat"
 
-#: camel/camel-pgp-context.c:526
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:533 camel/camel-pgp-context.c:707
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Nem lehet al��rni a levelet: nincs jelsz� megadva"
 
-#: camel/camel-pgp-context.c:539 camel/camel-pgp-context.c:713
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:700
+#: camel/camel-pgp-context.c:741
 #, 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:892
+#: camel/camel-pgp-context.c:939
 #, 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:898
+#: camel/camel-pgp-context.c:945
 #, 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:909
+#: camel/camel-pgp-context.c:956
 #, 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:1077
+#: camel/camel-pgp-context.c:1129
 #, 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:1087
+#: camel/camel-pgp-context.c:1139
 #, 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:1094
+#: camel/camel-pgp-context.c:1146
 #, 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:1103
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1323
 #, 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:1273
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nem lehet visszafejteni a levelet: nem volt jelsz� megadva"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1338
 #, 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"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s bet�lt�se sikertelen: A modulbet�lt�s nem t�mogatott a rendszereden."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s bet�lt�se sikertelen: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s bet�lt�se sikertelen: Nincs inicializ�l� k�d a modulban."
@@ -5721,7 +5893,7 @@ msgid "Connection cancelled"
 msgstr "Kapcsolat megszak�tva"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nem siker�lt csatlakozni %s %d portj�hoz: %s"
@@ -5731,12 +5903,12 @@ msgid "(unknown host)"
 msgstr "(ismeretlen kiszolg�l�)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "M�velet megszak�tva"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolg�l� v�ratlanul sz�tkapcsolt: %s"
@@ -5848,7 +6020,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
@@ -5865,8 +6037,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Jelsz�"
 
@@ -5896,57 +6068,57 @@ 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:158
+#: 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:166
+#: 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:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "'%s' felold�sa"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Sikertelen n�vkikeres�s: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, 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:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Virtu�lis mappa email szolg�ltat�"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "A leveleket m�s mapp�kon futtatott lek�rdez�s eredm�ny�t�l f�gg�en "
 "csoportos�thatod."
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "'%s' protokollhoz nincs t�mogat�s"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5992,17 +6164,17 @@ msgstr "A lev�l dek�dol�sa sikertelen."
 msgid "Failed to verify certificates."
 msgstr "Tan�s�tv�nyok ellen�rz�se sikertelen."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/camel-tcp-stream-openssl.c:542
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6012,7 +6184,7 @@ msgstr ""
 "T�ma: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:547 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6028,7 +6200,7 @@ msgstr ""
 "\n"
 "Elfogadod m�gis?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6047,37 +6219,37 @@ msgstr ""
 "�llam: %s\n"
 "Orsz�g: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nem siker�lte �rtelmezni ezt azt URL-t: '%s'"
 
-#: camel/camel-vee-folder.c:570
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nincs %s lev�l %s-ben"
 
-#: camel/camel-vee-folder.c:723
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Nincs %s lev�l"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem siker�lt bet�lteni a mapp�t: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem siker�lt bet�lteni a mapp�t: %s: %s"
@@ -6110,57 +6282,57 @@ msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "V�ratlan OK v�lasz az IMAP kiszolg�l�t�l: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nem siker�lt l�trehozni %s k�nyvt�rat: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nem siker�lt bet�lteni %s �sszefoglal�j�t"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "A mappa megsemmis�lt �s �jra l�tre lett hozva a kiszolg�l�n"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Megv�ltozott levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Ez a lev�l jelenleg nem el�rhet�"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "�sszefoglal� adatok let�lt�se az �j levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nem siker�lt megnyitni a gyorst�r k�nyvt�r�t: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "A lev�l dek�dol�sa sikertelen."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "�j levelek keres�se"
 
@@ -6168,7 +6340,7 @@ msgstr "�j levelek keres�se"
 msgid "Check for new messages in all folders"
 msgstr "�j levelek keres�se az �sszes mapp�ban"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:837
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mapp�k"
 
@@ -6202,28 +6374,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, 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:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Nem adt�l meg jelsz�t."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6234,89 +6406,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A sz�l�mappa nem tartalmazhat almapp�kat"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "A helyi levelek t�rol�sa MH-szer� lev�lk�nyvt�rakban"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Helyi k�zbes�t�s"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "A helyi levelek let�lt�se szabv�nyos mbox form�tum� t�rol�kb�l"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Sz�r�k alkalmaz�sa az �j levelekre ennek a kiszolg�l�nak az INBOX-�ban"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir-form�tum� f�jlok"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+#, fuzzy
+msgid "For storing local mail in maildir directories."
 msgstr "A helyi levelek t�rol�sa qmail maildir k�nyvt�rakban"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Szabv�nyos Unix mbox t�rol�k"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 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:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, 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:178
+#: camel/providers/local/camel-local-store.c:184
 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:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %s"
@@ -6327,23 +6503,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Nem siker�lt bet�lteni %s �sszefoglal�j�t"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nem siker�lt hozz�adni a levelet az �sszefoglal�hoz: ismeretlen ok"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "%d. lev�l rossz"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nem lehet a levelet a maildir mapp�hoz f�zni: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c: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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6352,20 +6533,20 @@ msgstr ""
 "Nem siker�lt bet�lteni a levelet: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Nincs ilyen lev�l"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "A lev�l tartalma �rv�nytelen"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6374,15 +6555,15 @@ msgstr ""
 "Nem siker�lt megnyitni '%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' mappa nem l�tezik."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6391,19 +6572,19 @@ msgstr ""
 "Nem siker�lt l�trehozni '%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "'%s' nem maildir k�nyvt�r."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nem siker�lt t�r�lni '%s' mapp�t: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "nem maildir k�nyvt�r"
 
@@ -6418,29 +6599,34 @@ msgstr "Nem siker�lt p�szt�zni ezt a mapp�t: `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nem siker�lt megnyitni a maildir k�nyvt�r el�r�si �tj�t: %s: %s "
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem siker�lt megnyitni a postal�d�t: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "M�velet megszak�tva"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nem siker�lt a levelet az mbox f�jlhoz hozz�f�zni: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6449,17 +6635,17 @@ msgstr ""
 "Nem siker�lt bet�lteni a k�vetkez� levelet %2$s mapp�b�l: %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A mappa jav�thatatlanul rossznak n�z ki."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lev�l�r�s sikertelen: rossz postafi�k?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6468,7 +6654,7 @@ msgstr ""
 "Nem siker�lt megnyitni '%s' f�jlt:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6477,14 +6663,14 @@ msgstr ""
 "Nem siker�lt l�trehozni `%s' f�jlt:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "'%s' nem k�z�ns�ges f�jl."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6493,107 +6679,115 @@ msgstr ""
 "Nem siker�lt t�r�lni `%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem �res. Nem t�r�lhet�."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Mappa t�rol�sa"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Nem siker�lt megnyitni '%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "V�gzetes lev�l�rtelmez�si hiba %ld poz�ci� k�zel�ben %s mapp�ban"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nem siker�lt bet�lteni a mapp�t: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Nem siker�lt megnyitni ezt a f�jlt: %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nem siker�lt megnyitni az ideiglenes postafi�kot: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Az �sszefoglal� �s a mappa elt�r, m�g egyeztet�s ut�n is"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Hiba az ideiglenes postafi�k �r�sa k�zben: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Sikertelen �r�si m�velet az ideiglenes postafi�kba: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nem siker�lt lez�rni a forr�smapp�t %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nem siker�lt bez�rni ezt az ideiglenes mapp�t: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Lev�l k�ld�se ennek a szem�lynek"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nem lehet a levelet az mh mapp�hoz f�zni: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nem k�nyvt�r."
@@ -6603,66 +6797,49 @@ msgstr "`%s' nem k�nyvt�r."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nem siker�lt megnyitni az MH k�nyvt�r el�r�si �tj�t: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' mappa nem l�tezik."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool lev�lf�jl"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool mapp�t nem lehet t�r�lni"
 
-#. 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 "Mappa�sszefoglal� k�sz�t�se"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"A mappa megnyit�sa sikertelen: %s: �sszegz�s ett�l a poz�ci�t�l: %ld: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Nem siker�lt %s mappa �sszefoglal�j�t elk�sz�teni: %s."
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nem siker�lt szinkroniz�lni ezt az ideiglenes mapp�t: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nem siker�lt p�szt�zni ezt a spool mapp�t: `%s': %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6671,137 +6848,137 @@ msgstr ""
 "Nem siker�lt szinkroniz�lni ezt a spool mapp�t: %s: %s\n"
 "A mappa val�sz�n�leg s�r�lt, m�solat mentve `%s' n�ven"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "%s bet�lt�se sikertelen: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Add meg %s@%s NNTP jelszav�t!"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Nem siker�lt a felhaszn�l�nevet elk�ldeni a kiszolg�l�nak"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "A kiszolg�l� visszautas�totta a felhaszn�l�n�v/jelsz� p�rost"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "%s lev�l nem tal�lhat�"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nem siker�lt megszerezni a csoportlist�t a kiszolg�l�r�l."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nem siker�lt bet�lteni %s csoportlistaf�jlj�t: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nem siker�lt menteni %s csoportlistaf�jlj�t: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Ez egy seg�delem a USENET h�rcsoportok �r�s�hoz �s olvas�s�hoz."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nem siker�lt megnyitni a news-kiszolg�l� k�nyvt�r�t: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News %s-r�l"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "Ez a be�ll�t�s sima sz�veges jelsz�t haszn�l az NNTP kiszolg�lhoz."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nem siker�lt .newsrc f�jlt l�trehozni %s sz�m�ra: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "POP �sszefoglal� let�lt�se"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "A t�rl�sre kijel�lt levelek elt�vol�t�sa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nem siker�lt let�lteni a levelet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonos�t�j� lev�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP lev�l let�lt�se"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Lev�lt�rol�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Az �zenetek maradjanak meg a kiszolg�l�n is"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Csatlakoz�s �s a levelek let�lt�se POP kiszolg�l�kr�l"
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6809,7 +6986,7 @@ msgstr ""
 "Ez a be�ll�t�s sima sz�veges jelsz�val kapcsol�dik a POP kiszolg�l�hoz. Sok "
 "POP kiszolg�l� csak ezt a m�dot t�mogatja."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6820,33 +6997,33 @@ msgstr ""
 "m�g azokon a kiszolg�l�kon sem, amelyek azt hirdetik magukr�l, hogy "
 "t�mogatj�k."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Ez a be�ll�t�s Kerberos 4 hiteles�t�ssel csatlakozik a POP kiszolg�l�val."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nem siker�lt a hiteles�t�s a KPOP kiszolg�l�hoz: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nem siker�lt a POP kiszolg�l�hoz kapcsol�dni a %s g�pen."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sAdd meg %s@%s POP3 jelszav�t!"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6855,12 +7032,12 @@ msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6868,7 +7045,7 @@ msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "A k�rt authentik�ci�s mechanizmus nem t�mogatott."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6877,196 +7054,196 @@ msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a jelsz� k�ld�se k�zben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Lev�l k�zbes�t�se a helyi rendszer \"sendmail\" programj�val."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nem siker�lt cs�vezet�ket l�trehozni a sendmailhez: %s: a lev�l nem ment el"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nem siker�lt forkolni a sendmailt: %s: a lev�l nem ment el"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nem siker�lt elk�ldeni a levelet: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "A sendmail %s szign�llal kil�pett, a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nem siker�lt v�grehajtani %s-t, a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "A sendmail %d �llapottal l�pett ki: a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "A felad� c�me nem tal�lhat� meg a lev�lben"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "A lev�lk�zbes�t�s egy t�voli SMTP-t haszn�l� levelez�rendszer seg�ts�g�vel "
 "t�rt�nik.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Szintaktikai hiba, ismeretlen parancs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Szintaktikai hiba a param�terekben vagy argumentumokban"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "A parancs nincs megval�s�tva"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "A parancsparam�ter nincs megval�s�tva"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Rendszer�llapot, vagy rendszer-seg�d�zenet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Seg�d�zenet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Szolg�ltat�s rendelkez�sre �ll"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "A szolg�ltat�s lez�rja az �tviteli csatorn�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "A szolg�ltat�s nem el�rhet�, az �tviteli csatorna lez�r�dik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "A k�rt lev�lm�velet rendben, k�sz van"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "A felhaszn�l� nem helyi, tov�bb�t�s a <forward-path>-ra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "A k�rt lev�lm�velet sikertelen: nem el�rhet� a postafi�k"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A k�rt m�velet sikertelen: nem el�rhet� a postafi�k"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "A k�rt m�velet megszak�tva: hiba a feldolgoz�s k�zben"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Nem helyi felhaszn�l�; pr�b�ld a <forward-path>-t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "A k�rt m�velet sikertelen: el�gtelen rendszer-t�rol�hely"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A k�rt m�velt sikertelen: t�rfoglal�s t�ll�p�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A k�rt m�velet sikertelen: nem enged�lyezett postafi�kn�v"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Kezd el �rni a levelet, fejezd be <CRLF>.<CRLF>-el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Sikertelen tranzakci�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Jelsz��tvitel sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "A hiteles�t�si mechanizmus t�l gyenge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "A k�rt hiteles�t�si mechanizmushoz titkos�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Ideiglenes azonos�t�si hiba"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Hiteles�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "�dv�zl� v�lasz hiba: %s: tal�n nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s SMTP kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAdd meg %s@%s SMTP jelszav�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7077,168 +7254,168 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP kiszolg�l�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP lev�lk�ld�s %s kiszolg�l�n �t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me nincs megadva."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me �rv�nytelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Lev�l k�ld�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP �dv�zlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Id�t�ll�p�s a HELO k�r�sn�l: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO v�lasz hiba: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP hiteles�t�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hiteles�t�si objektum l�trehoz�sakor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH k�r�s sikertelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a MAIL FROM k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Hib�s MAIL FROM v�lasz: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s az RCPT TO k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Hib�s RCPT TO v�lasz: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Hib�s DATA v�lasz: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Id�t�ll�p�s a DATA k�ld�s�n�l: a lev�l v�get �rt: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Hib�s DATA v�lasz: a lev�l v�get �rt: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Id�t�ll�p�s a QUIT k�r�sn�l: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Hib�s QUIT v�lasz: %s: nem v�gzetes"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "mell�klet"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "T�rli a kiv�lasztott elemeket a mell�kletlist�r�l"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Csatol�s..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "F�jl csatol�sa a lev�lhez"
 
@@ -7270,52 +7447,52 @@ msgstr "MIME-t�pus:"
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a mell�klet automatikus megjelen�t�s�t"
 
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Felad�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "V�laszc�m:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "T�rgy:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "C�mzett:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "M�solat:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�rd be, kik kapjanak m�solatot a lev�lr�l"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Titkos m�solat:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7328,7 +7505,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7337,29 +7514,29 @@ msgstr ""
 "F�jlbeolvas�si hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Ment�s m�sk�nt..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "A f�jl l�tezik, fel�l�rod?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jlment�si hiba: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jlbet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7367,16 +7544,16 @@ msgstr ""
 "Nem siker�lt megnyitni az ehhez a postafi�khoz tartoz� piszkozatok mapp�t.\n"
 "Szeretn�d haszn�lni az alap�rtelmezett piszkozatok mapp�t?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "F�jlel�r�si hiba: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nem siker�lt bet�lteni a levelet a szerkeszt�b�l"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7385,7 +7562,7 @@ msgstr ""
 "Nem siker�lt keresni a f�jlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7394,7 +7571,7 @@ msgstr ""
 "Nem siker�lt csonkolni a  f�jlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7403,7 +7580,7 @@ msgstr ""
 "Hiba a levelek automatikus ment�se k�zben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7412,7 +7589,7 @@ msgstr ""
 "f�jlokat.\n"
 "Szeretn�d megk�s�relni a vissza�ll�t�sukat?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7422,29 +7599,29 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:1327
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "F�jl beilleszt�se"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2312
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:2329
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2352
+#: composer/e-msg-composer.c:2369
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7453,7 +7630,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot, mert m�g nem\n"
 "�ll�tott�l be egy azonos�t�t sem a levelez�komponensben."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7461,11 +7638,11 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot, mert m�g nem\n"
 "�ll�tott�l be egy azonos�t�t sem a levelez�komponensben."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Az Evol�ci� levelez� komponens�t nem siker�lt inicializ�lni."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evol�ci�"
 
@@ -7513,15 +7690,24 @@ msgstr "A t�rgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A t�rgy nem tartalmazza"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Jelsz� megjegyz�se"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %a %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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %a %H:%M"
 
@@ -7580,30 +7766,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7742,7 +7928,7 @@ msgstr "Akkor"
 msgid "Add action"
 msgstr "M�velet hozz�ad�sa"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7751,16 +7937,16 @@ 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:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "�rj be egy mappa URI-t"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiv�laszt�s�hoz>"
 
@@ -7777,39 +7963,39 @@ msgstr ""
 msgid "Test"
 msgstr "Teszt"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Szab�ly neve:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "N�vtelen"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Keres�si felt�telek"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "M�velet v�grehajt�sa,"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "ha minden felt�tel teljes�l"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "ha b�rmely felt�tel teljes�l"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Felt�tel hozz�ad�sa"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "bej�v�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "kimen�"
 
@@ -8002,7 +8188,7 @@ msgstr "V�lasz"
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1333
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Felad�"
 
@@ -8034,7 +8220,7 @@ msgstr "�gy kezd�dik:"
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:927
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "T�rgy"
@@ -8047,15 +8233,15 @@ msgstr "ut�n volt"
 msgid "was before"
 msgstr "el�tte volt"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Szab�lyok"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Szab�ly hozz�ad�sa"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Szab�ly szerkeszt�se"
 
@@ -8063,43 +8249,43 @@ msgstr "Szab�ly szerkeszt�se"
 msgid "Score Rules"
 msgstr "Pontsz�mszab�lyok"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "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."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evol�ci� import�lja a r�gi Elm leveleket."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Import�l�s folyamatban..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "V�rj"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s import�l�sa %s-k�nt"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "%s p�szt�z�sa"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Lev�l"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8107,19 +8293,15 @@ msgstr ""
 "Az Evol�ci� Elm lev�lf�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evol�ci�ba import�lni?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "C�mjegyz�k"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8127,23 +8309,23 @@ msgstr ""
 "Az Evol�ci� GnomeCard f�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evol�ci�ba import�lni?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evol�ci� import�lja a r�gi Netscape adatokat."
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Mappa p�szt�z�sa"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Import�l�s kezdete"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Be�ll�t�sok"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8151,12 +8333,12 @@ msgstr ""
 "Az Evol�ci� Netscape lev�lf�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evol�ci�ba import�lni?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 #, fuzzy
 msgid "Evolution is importing your old Pine data"
 msgstr "Az Evol�ci� import�lja a r�gi Pine adatokat."
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8164,7 +8346,7 @@ msgstr ""
 "Az Evol�ci� Pine lev�lf�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evol�ci�ba import�lni?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8200,242 +8382,247 @@ msgstr "Factory a levelez� �sszefoglal� komponens�hez."
 msgid "Mail configuration interface"
 msgstr "Levelez�st be�ll�t� fel�let"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Leveleket tartalmaz� mappa"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Lev�lt�rol� mappa (bels�)"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtu�lis kuka"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtu�lis kukamappa"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Ez a mappa nem tartalmazhat leveleket."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Tulajdons�gok..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdons�gainak m�dos�t�sa"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:861
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:861
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "�_j lev�l"
 
-#: mail/component-factory.c:885
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem siker�lt az Evol�ci� levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nem siker�lt az Evol�ci� levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:900
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" tulajdons�gai"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Tulajdons�gok"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem siker�lt l�trehozni az ideiglenes k�nyvt�rat: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d �j"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d rejtett"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d kijel�lve"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d post�zand�"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d post�zand�"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "VMappa gy�rt�sa keres�sb�l"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VMappa a _t�rgyra"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _felad�ra"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _c�mzettekre"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Sz�_r� a t�rgyra"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Sz�r� a f_elad�ra"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Sz�r� a _c�mzettekre"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "S_zerkeszt�s �j lev�lk�nt..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "M_ent�s m�sk�nt..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_V�lasz a felad�nak"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "V�lasz a _list�nak"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "V�lasz _mindenkinek"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "�_thelyez�s mapp�ba..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_M�sol�s mapp�ba..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Vissza�ll�t�s"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Felad� hozz�ad�sa a c�mjegyz�khez"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "S_zab�ly gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Sz�r� a levelez�list�ra"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VMappa a levelez�list�ra"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Sz�r� a levelez�list�ra (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VMappa a levelez�list�ra (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Alap�rtelmezett"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Mappaadatok �sszegy�jt�se"
@@ -8514,18 +8701,18 @@ msgstr "Evol�ci� News-szerkeszt�"
 msgid "Evolution Account Editor"
 msgstr "Evol�ci� Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, 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:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Al��r�s ment�se"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8535,7 +8722,7 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
@@ -8551,52 +8738,52 @@ msgstr "Tilt�s"
 msgid "Enable"
 msgstr "Enged�lyez�s"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "T�nyleg t�r�lni akarod ezt a postafi�kot?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nem t�r�l"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "T�nyleg t�rl�d a postafi�kot?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Levelez� be�ll�t�sai"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Lev�l %s-nek"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "A t�ma %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Lev�l %s-t�l"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelez�lista"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Sz�r�szab�ly hozz�ad�sa"
 
-#: mail/mail-callbacks.c:140
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8608,7 +8795,7 @@ msgstr ""
 "k�ldhetn�l, fogadhatn�l vagy �rhatn�l.\n"
 "Szeretn�d most be�ll�tani?"
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8616,7 +8803,7 @@ msgstr ""
 "Be kell �ll�tanod egy azonos�t�t,\n"
 "miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8629,17 +8816,19 @@ msgid "You have not set a mail transport method"
 msgstr "A lev�lk�ld�s m�dja nincs be�ll�tva"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:264
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
-msgstr "HTML form�tum� levelet k�ldesz, de ezek a c�mzettek nem akarnak HTML form�tum� leveleket kapni:\n"
+msgstr ""
+"HTML form�tum� levelet k�ldesz, de ezek a c�mzettek nem akarnak HTML "
+"form�tum� leveleket kapni:\n"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Mindenk�pp elk�ld�d?"
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8647,7 +8836,7 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8655,11 +8844,11 @@ msgstr ""
 "Mivel a c�mlista �gy van be�ll�tva, hogy rejtse el a tagok c�m�t, a lev�l "
 "csak titkos c�mzetteket fog tartalmazni."
 
-#: mail/mail-callbacks.c:369
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "A lev�l csak titkos c�mzetteket tartalmaz."
 
-#: mail/mail-callbacks.c:373
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8669,40 +8858,40 @@ msgstr ""
 "fejl�c hozz�ad�s�val.\n"
 "M�gis elk�ld�d?"
 
-#: mail/mail-callbacks.c:467
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "A lev�l �rv�nytelen c�mzetteket tartalmaz:"
 
-#: mail/mail-callbacks.c:502
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Meg kell adnod c�mzetteke, miel�tt elk�ldhetn�d a levelet."
 
-#: mail/mail-callbacks.c:598
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Be kell �ll�tanod egy azonos�t�t, miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:834
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltez�ssel %%s ezt �rta:"
 
-#: mail/mail-callbacks.c:1235
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1237
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Lev�l(levelek) m�sol�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1632
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "T�nyleg szerkeszteni szeretn�d mind a %d levelet?"
 
-#: mail/mail-callbacks.c:1654
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8710,7 +8899,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:1690
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8718,28 +8907,28 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:1704
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "T�nyleg �jra akarod k�ldeni mind a %d �zenetet?"
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:1962 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Figyelmeztet�s"
 
-#: mail/mail-callbacks.c:1969
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8751,11 +8940,11 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Ne k�rdezze meg t�bbet."
 
-#: mail/mail-callbacks.c:2081
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8764,19 +8953,19 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2093
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: mail/mail-callbacks.c:2187
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Lev�l nyomtat�sa sikertelen"
 
-#: mail/mail-callbacks.c:2276
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "T�nyleg k�l�n ablakban akarod megnyitni mind a %d levelet?"
@@ -8831,7 +9020,7 @@ msgstr ""
 "csak az Evol�ci� programban jelenik meg."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evol�ci� Postafi�k var�zsl�"
 
@@ -8877,31 +9066,34 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ez az Evol�ci�-v�ltozat nem t�mogatja az SSL-t)"
 
 #: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Postafi�k"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Postafi�k-inform�ci�"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Postafi�k-kezel�s"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Postafi�kok"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
-msgstr "Mindig titkos�t nekem is, ha tikos�tott levelet k�ld�k"
+#, fuzzy
+msgid "Always _encrypt to myself when sending encrypted mail"
+msgstr "Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
 msgstr "Mindig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8913,26 +9105,23 @@ msgid "Authentication"
 msgstr "Hiteles�t�s:"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Hiteles�t�si t�pus:"
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "�j levelek keres�se"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "Tan�s�tv�nyazonos�t�:"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Szerkeszt�"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 msgid "Configuration"
 msgstr "Be�ll�t�sok"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr "Meger�s�t�s a mappa tiszt�t�sakor"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8948,229 +9137,235 @@ msgstr ""
 "\n"
 "Kattints a \"Befejez�s\" gombra a be�ll�t�sok ment�s�hez."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "_Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "A \"Tov�bb�t�s\" alap�rtelmezett st�lusa: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Alap�rtelmezett karakterk�dol�s: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "Digit�lis azonos�t�k..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Megjelen�t�s"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "K�sz"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Piszkozatok"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Piszkozatok mappa"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "E_nged�lyez�s"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Szerkeszt�s..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Akt�v"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Digit�lis azonos�t� szerz�se..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML al��r�sf�jl:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Azonos�t�"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML lev�lben"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Be�gyazott"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Postafi�k helye"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP kiszolg�l�:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Egy�b inform�ci�"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "PGP kulcs azonos�t�ja:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "V�lassz egy sz�nt"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "K�rdez, ha HTML levelet k�ldesz olyan c�mre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 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:60
+#: mail/mail-config.glade.h:57
 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:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Id�zet"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Jelsz� megjegyz�se"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Fogad�s be�ll�t�sai"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Sz�ks�ges inform�ci�"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Biztons�gos MIME"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Biztons�g"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "V�lassz egy sz�r�napl�f�jlt"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "V�laszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Elk�ldve"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Elk�ld�tt levelek mapp�ja"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "Elk�ld�tt levelek mapp�ja"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Kiszolg�l� t�pusa: "
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Al��r�s f�jl:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Forr�s"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Forr�sinform�ci�"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Forr�sok"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "K�l�nleges mapp�k"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "Biztons�gos kapcsolat haszn�lata (_SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9180,103 +9375,130 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 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:92
+#, fuzzy
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Mindig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Hiteles�t�si t�pus:"
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "Az �j _levelek automatikus lek�rdez�se minden"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "_T�mogatott t�pusok detekt�l�sa"
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "Tan�s�tv�nyazonos�t�:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Piszkozatok mappa"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "_Emailc�m:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "_Kuka �r�t�se kil�p�skor"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Teljes n�v:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "_HTML al��r�s:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Id�zetek kiemel�se"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 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:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "Sz�r�m�veletek _napl�z�sa ide:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 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:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 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:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Szervezet:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "_PGP program el�r�si �tja:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "�_tvonal:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 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:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Kiszolg�l� t�pusa: "
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "A_l��r�s f�jl:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "_Felhaszn�l�n�v:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Minden"
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "helykit�lt�"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "m�sodperc."
 
@@ -9316,151 +9538,146 @@ msgstr "Nem siker�lt l�trehozni az S/MIME bor�t�k r�szt."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nem siker�lt l�trehozni az S/MIME dek�dol� r�szt."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Ment�s a lemezre..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Megtekint�s be�gyazva"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyit�s ezzel: %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Megtekint�s be�gyazva (%s seg�ts�g�vel)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "K�ls� n�z�ke"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�zenet tartalm�nak bet�lt�se"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Hivatkoz�s megnyit�sa b�ng�sz�ben"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Hivatkoz�s hely�nek m�sol�sa"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkoz�s ment�se m�sk�nt (FIXME)"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "K�p ment�se m�sk�nt..."
 
-#: mail/mail-format.c:629
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s mell�klet"
 
-#: mail/mail-format.c:682
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem siker�lt �rtelmezni a MIME-�zenetet. Megjelen�t�s forr�sk�nt."
 
-#: mail/mail-format.c:766
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Rossz c�m"
 
-#: mail/mail-format.c:909 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Felad�"
 
-#: mail/mail-format.c:912
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: mail/mail-format.c:916 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "C�mzett"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Titkos m�solat"
 
-#: mail/mail-format.c:1371
-msgid "No GPG/PGP program configured."
-msgstr "Nincs be�ll�tva GPG/PGP program."
-
-#: mail/mail-format.c:1387
-msgid "Encrypted message not displayed"
-msgstr "A titkos�tott �zenet nem jelenik meg"
-
-#: mail/mail-format.c:1398
-msgid "Encrypted message"
-msgstr "Titkos�tott �zenet"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Az �zenetet digit�lisan al��rt�k, �s az al��r�s hiteles."
 
-#: mail/mail-format.c:1399
-msgid "Click icon to decrypt."
-msgstr "A titkos�t�s visszafejt�s�hez kattints az ikonra."
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Ez a napt�r�sszetev� nem felismerhet�."
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1830
 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:1465
+#: mail/mail-format.c:1838
 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:2142
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2156
+#: mail/mail-format.c:2068
 #, 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:2161
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2198
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2203
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Mappa �jrabe�ll�t�sa"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9469,29 +9686,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:723
+#: mail/mail-local.c:763
 #, 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:769
+#: mail/mail-local.c:815
 #, 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:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" mappa �talak�t�sa \"%s\" form�tumra"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, 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:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9499,16 +9716,16 @@ msgstr ""
 "Ha nem tudod t�bb� megnyitni ezt a postafi�kot, \n"
 "akkor esetleg k�zzel kell megjav�tanod."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 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:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �jrabe�ll�t�sa"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9517,7 +9734,7 @@ msgstr ""
 "Hiba `%s' k�zben:\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9526,25 +9743,7 @@ msgstr ""
 "Hiba a m�velet v�grehajt�sa k�zben:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Jelsz� megjegyz�se"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr "Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr "�rd be %s jelszav�t"
-
-#: mail/mail-mt.c:567
-msgid "Enter Password"
-msgstr "�rd be a jelsz�t"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "V�rj"
 
@@ -9552,118 +9751,113 @@ msgstr "V�rj"
 msgid "Filtering Folder"
 msgstr "Mappa sz�r�se"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "A lev�l ennek ellen�re sikeresen elment."
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' k�ld�se"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d �zenet k�ld�se"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "K�sz."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Lev�l ment�se a mapp�ba"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek mozgat�sa %s-be"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek m�sol�sa %s-be"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Nem siker�lt mapp�t �nmag�ra m�solni."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "M�sol�s alatt"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mapp�k p�szt�z�sa \"%s\"-ben"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Kuka"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Tov�bb�tott levelek"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyit�sa"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "%s t�rol� megnyit�sa"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa elt�vol�t�sa"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa t�rol�sa"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Mappa friss�t�se"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Mappa tiszt�t�sa"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s lev�l let�lt�se"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d lev�l let�lt�se"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d lev�l ment�se"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9672,7 +9866,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9681,11 +9875,11 @@ msgstr ""
 "Hiba a levelek ment�se k�zben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9694,17 +9888,17 @@ msgstr ""
 "Nem lehet l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem siker�lt az adatok ki�r�sa: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
@@ -9713,95 +9907,104 @@ msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
 msgid "_Search"
 msgstr "_Keres�s"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(N�vtelen lev�l)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "N�vtelen lev�l"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "�res lev�l"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Keres�s a lev�lben"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Kis- �s nagybet�k megk�l�nb�ztet�se"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Keres�s el�re"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Keres�s:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Tal�latok:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Megszak�t�s..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Kiszolg�l�: %s,  T�pus: %s "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�tvonal: %s, T�pus: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "T�pus: %s"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Levelek k�ld�se �s fogad�sa"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Mindent megszak�t"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Friss�t�s folyamatban..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "V�rakoz�s..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Megszak�tva"
 
-#: mail/mail-session.c:166
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr "�rd be %s jelszav�t"
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr "�rd be a jelsz�t"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Tov�bb�tott �zenet - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Vmappa be�ll�t�sa: %s"
@@ -9811,7 +10014,7 @@ msgstr "Vmappa be�ll�t�sa: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Mappa m�sol�sa %s-b�l %s-be"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9820,28 +10023,28 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VMapp�k"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "VMappa szerkeszt�se"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "�j VMappa"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Nincs t�rgy)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - �zenet"
@@ -9902,7 +10105,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Lev�llista l�trehoz�sa"
 
@@ -9928,26 +10131,26 @@ msgstr "Mapp�k p�szt�z�sa %s alatt \"%s\"-en"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Gy�k�rszint� mapp�k p�szt�z�sa \"%s\"-en"
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Feliratkoz�s \"%s\" mapp�ra"
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkoz�s \"%s\" mapp�r�l"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappa"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Nincs kiszolg�l� kiv�lasztva."
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "V�lassz egy kiszolg�l�t."
 
@@ -9987,120 +10190,114 @@ msgstr "_Leiratkoz�s"
 msgid "Evolution component for the executive summary."
 msgstr "Vezet�i �sszefoglal� Evol�ci� komponens."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Az Evol�ci� �sszefoglal�j�t tartalmaz� mappa"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Nem siker�lt az Evol�ci� �sszefoglal� komponens�t inicializ�lni."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Nincsenek tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:363
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:365
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "LHBP:LHSY"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 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:467
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 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:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "N�v:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "�sszefoglal� be�ll�t�sai"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: 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:512
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Nincsenek feladatok"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Nincs le�r�s)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Az id�j�r�s-kiszolg�l� nem el�rhet�</b></dd>"
 
-#: my-evolution/e-summary-weather.c:546
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "Id�j�r�s"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:637
-msgid "KBOS:EGAA:RJTT"
-msgstr "LHBP:LHSY"
-
-#: my-evolution/e-summary-weather.c:698
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "R�gi�k"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e, %A"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "�sszefoglal� nyomtat�sa"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Az �sszefoglal� nyomtat�sa sikertelen"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
 
@@ -11288,7 +11485,8 @@ msgid " _Remove"
 msgstr " _T�rl�s"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+#, fuzzy
+msgid "Add n_ews feed"
 msgstr "�_j h�rforr�s hozz�ad�sa"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11411,23 +11609,23 @@ msgstr "R�szletek"
 msgid "Cancel Operation"
 msgstr "M�velet megszak�t�sa"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Be�rkezett levelek"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Post�zand� levelek"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Helyi mapp�k"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evol�ci� telep�t�s"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11435,17 +11633,17 @@ msgstr ""
 "Az Evol�ci�nak ez az �j verzi�ja tov�bbi f�jlokat fog telep�teni\n"
 "a szem�lyes Evol�ci� k�nyvt�radba"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Nyomd meg az \"OK\" gombot a f�jlok telep�t�s�hez, vagy a \"M�gse\" gombot a "
 "kil�p�shez."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nem siker�lt rendesen friss�teni a f�jlokat."
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11456,7 +11654,7 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11465,7 +11663,7 @@ msgstr ""
 "Hiba t�rt�nt a f�jlok m�sol�sa k�zben ide: \n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11476,7 +11674,7 @@ msgstr ""
 "K�rlek mozgasd el a f�jlt, hogy az Evol�ci�\n"
 "telep�lni tudjon."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11490,7 +11688,7 @@ msgstr ""
 "t�vol�tani, miel�tt a program futhatna.\n"
 "Szeretn�d elt�vol�tani ezt a k�nyvt�rat?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11501,6 +11699,19 @@ msgstr ""
 "K�rlek t�r�ld a f�jlt, hogy az Evol�ci�\n"
 "telep�lni tudjon."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evol�ci�"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Nem siker�lt a mapp�t �nmag�ra �thelyezni."
@@ -11551,7 +11762,7 @@ msgstr "\"%s\" t�rl�se"
 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:456
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11560,15 +11771,21 @@ msgstr ""
 "Nem siker�lt �tnevezni a mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Mappa �tnevez�se"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "A megadott mappan�v nem j�: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11578,32 +11795,11 @@ msgstr ""
 "Nem siker�lt elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Nincs mappan�v megadva"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "A mappan�v nem tartalmazhatja a Return karaktert."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "A mappan�v nem tartalmazhatja a k�nyvt�relv�laszt�t."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "A '.' �s a '..' fenntartott mappanevek."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "A megadott mappan�v nem j�: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evol�ci� - �j mappa k�sz�t�se"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11611,19 +11807,19 @@ msgstr ""
 "A kiv�lasztott mappa t�pusa nem j� a megadott\n"
 "m�velethez."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "�j..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(N�vtelen)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11637,13 +11833,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
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11654,7 +11850,7 @@ msgstr ""
 "Az import�l� nem felel.\n"
 "Pr�b�lkoz�s 5 m�sodperc m�lva."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11663,16 +11859,16 @@ msgstr ""
 "%s import�l�sa\n"
 "%d. elem import�l�sa."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' f�jl nem l�tezik."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Csak helyi mapp�kba tudsz import�lni"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11681,11 +11877,11 @@ msgstr ""
 "Nincs olyan import�l�, amely k�pes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Import�l�s folyamatban"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11694,17 +11890,17 @@ msgstr ""
 "%s import�l�sa.\n"
 "%s ind�t�sa"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s ind�t�sakor"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s bet�lt�sekor"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11713,31 +11909,31 @@ msgstr ""
 "%s import�l�sa\n"
 "1. elem import�l�sa."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "F�jln�v:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "V�lassz egy f�jlt"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "F�jlt�pus:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Egyetlen f�jl import�l�sa"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:574
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11745,103 +11941,120 @@ msgstr ""
 "V�rj...\n"
 "Megl�v� be�ll�t�sok keres�se"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:577
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Az okos import�l�k ind�t�sa"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Felad� %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "V�lassz mapp�t"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 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:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�l�s"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Kapcsolatok bez�r�sa..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d)Nem siker�lt elind�tani az Evol�ci� Levelez�be�ll�t� Var�zsl� "
+"fel�let�t\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
-"(%s:%d)Nem siker�lt elind�tani az Evol�ci� Levelez�be�ll�t� Var�zsl� fel�let�t\n"
+"(%s:%d)Nem siker�lt elind�tani az Evol�ci� Levelez�be�ll�t� Var�zsl� "
+"fel�let�t\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:740
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Nincs mappan�v megadva"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "A mappan�v nem tartalmazhatja a Return karaktert."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Ez a mappa nem tartalmazhat leveleket."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "A '.' �s a '..' fenntartott mappanevek."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Nem siker�lt futtatni a Bug buddy-t."
 
-#: shell/e-shell-view-menu.c:235
-msgid "Ximian Evolution"
-msgstr "Ximian Evol�ci�"
-
-#: 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:239
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"A Ximian Evol�ci� egy munkacsoport program \n"
-"levelez�shez, napt�r �s c�mjegyz�k funkci�kkal\n"
-"a GNOME grafikus k�rnyezethez."
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "A Ximian Evol�ci� n�vjegye..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Ugr�s mapp�ba..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "V�laszd ki a megnyitand� mapp�t"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "�j ind�t�ikon l�trehoz�sa"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 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:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr "Hiba a %s v�grehajt�sa k�zben."
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "Munka a h�l�zatban"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "K_apcsolat n�lk�li munka"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Kapcsolat n�lk�li munka"
 
@@ -11849,49 +12062,39 @@ msgstr "Kapcsolat n�lk�li munka"
 msgid "(No folder displayed)"
 msgstr "(Nem jelen�thet� meg a mappa)"
 
-#: shell/e-shell-view.c:1585
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(semmi)"
 
-#: shell/e-shell-view.c:1592
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evol�ci� %s"
-
-#: shell/e-shell-view.c:1594
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evol�ci� %s [%s]"
-
-#: shell/e-shell-view.c:1634
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "A Ximian Evol�ci� a h�l�zatban van. Kattints erre a gombra a kapcsolat "
 "n�lk�li munk�hoz."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "A Ximian Evol�ci� felk�sz�l a kapcsolat n�lk�li munk�ra."
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 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:563
+#: shell/e-shell.c:651
 #, 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:1499
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11899,35 +12102,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1722 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1724
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "�rv�nytelen argumentumok"
 
-#: shell/e-shell.c:1726
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Nem siker�lt regisztr�lni az OAF-ban"
 
-#: shell/e-shell.c:1728
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "A be�ll�t�sok adatb�zisa nem tal�lhat�"
 
-#: shell/e-shell.c:1730 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "�ltal�nos hiba"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "�j ind�t�ikon-csoport l�trehoz�sa"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Csoport neve:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11936,111 +12135,111 @@ msgstr ""
 "T�nyleg elt�vol�tod '%s' csoportot\n"
 "az ind�t�s�vr�l?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ne t�vol�tsa el"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Ind�t�ikoni-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "A kijel�lt ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "�_j csoport..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "�j ind�t�csoport l�trehoz�sa"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Csoport elt�vol�t�sa..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Ind�t�csoport elt�vol�t�sa az ind�t�s�vr�l"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "C_soport �tnevez�se..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Ind�t�s�v el_rejt�se"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Ind�t�s�v elrejt�se"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Ind�t�ikon �tnevez�se"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Az ind�t�ikonhoz tartoz� mappa megnyit�sa"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Megnyit�s �j _ablakban"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Az ind�t�ikonhoz tartoz� mappa megnyit�sa �j ablakban"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "�_tnevez�s"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_T�rl�s"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Nem siker�l elmenteni az elemeket."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Ind�t�ikonok"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12049,73 +12248,144 @@ msgstr ""
 "Nem siker�lt t�r�lni a mapp�t:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(n�vtelen)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "A mappa nem �res."
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "A megadott mappa nem tal�lhat�"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "A megadott mappa nem m�dos�that� vagy t�r�lhet�"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nem lehet a mapp�t a saj�t almapp�j�ba �thelyezni."
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Nem k�nyvt�rat l�trehozni ezen a n�ven"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% k�sz)"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "I/O hiba"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "�rv�nytelen argumentumok"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Senki"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Nem tal�lom a f�jlt"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "_T�mogatott t�pusok detekt�l�sa"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "A felhaszn�l� megszak�totta a m�veletet."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Egy�b hiba"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "L�tezik"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Helytelen"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Nincs %s mappa."
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Nincs lev�l kijel�lve"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12126,7 +12396,7 @@ msgstr ""
 "\n"
 "Ismeretlen hiba."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12135,7 +12405,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12240,84 +12510,68 @@ msgstr ""
 "Ez a var�zsl� v�gigvezet a k�ls� f�jlok Evol�ci�ba \n"
 "import�l�s�nak folyamat�n."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Import�l�k"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Ne import�lja"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Ne k�rdezze meg t�bbet."
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Az Evol�ci� a k�vetkez� f�jlokb�l k�pes adatokat import�lni:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Az Evol�ci� most kil�p..."
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Szia! K�sz�nj�k, hogy let�lt�tted az Ximian Evol�ci� csoportmunka-szoftver\n"
-"el�zetes verzi�j�t.\n"
-"\n"
-"A Ximian Evol�ci� m�g nincs k�sz. M�r k�zel van a befejez�shez, de vannak\n"
-"olyan r�szek, amelyek hi�nyoznak vagy csak f�lig m�k�dnek. \n"
-"\n"
-"A hib�t tal�lsz, jelentsd a bugzilla.ximian.com-on.\n"
-"Erre a term�kre nem vonatkozik semmilyen garancia, �s nem\n"
-"val� idegesked�sre hajlamos embereknek.\n"
-"\n"
-"Rem�lj�k, �lvezni fogod a kem�ny munk�nk eredm�ny�t, �s v�rjuk\n"
-"hozz�j�rul�sod! \n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"K�sz�nettel\n"
-"A Ximian Evol�ci� Csapat\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "A Ximian Evol�ci� h�j nem el�rhet�."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nem siker�lt inicializ�lni a Ximian Evol�ci� h�jat: %s"
 
-#: shell/main.c:346
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Ind�t�k�perny� letilt�sa"
 
-#: shell/main.c:347
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden �sszetev� hibakeres� �zeneteit f�jlba ir�ny�tja."
 
-#: shell/main.c:389
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem siker�lt inicializ�lni a Bonobo komponens rendszert."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "F�jlbet�lt�si hiba: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "F�jl megnyit�s"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "F�jl beilleszt�se"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Nincs mappan�v megadva"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12407,7 +12661,7 @@ msgstr "Bet�lt�s le�ll�t�sa"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_M�veletek"
@@ -12429,7 +12683,7 @@ msgid "_Forward Contact..."
 msgstr "N�vjegy _tov�bb�t�sa..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Nyomtat�s..."
@@ -12474,7 +12728,7 @@ msgstr "Nap"
 msgid "Delete the appointment"
 msgstr "A tal�lkoz� t�rl�se"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Ugr�s"
 
@@ -12597,11 +12851,12 @@ msgstr "Nyomtat�s..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Ment�s"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Ment�s �s bez�r�s"
 
@@ -12617,7 +12872,7 @@ msgstr "Elem ment�se lemezre"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_F�jl"
@@ -12639,7 +12894,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Ment�s"
 
@@ -12699,10 +12954,6 @@ msgstr "�rtekezlet tervez�se ehhez az elemhez"
 msgid "Customise My Evolution"
 msgstr "A Saj�t Evol�ci� testreszab�sa"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "M�gse"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Megszak�tja az aktu�lis lev�lm�veletet"
@@ -12961,279 +13212,309 @@ msgstr "Virtu�lis mappa l�trehoz�sa erre a felad�ra"
 msgid "Create a virtual folder for this subject"
 msgstr "Virtu�lis mappa l�trehoz�sa erre a t�rgyra"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "A k�vetkez� fontos lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "A k�vetkez� lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "A k�vetkez� olvasatlan sz�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Az el�z� fontos lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Az el�z� lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Az el�z� olvasatlan lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Sz�r� a _levelez�list�ra..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "S_z�r� a felad�ra..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Sz�r� a _c�mzettekre..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Sz�r� a _t�rgyra..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "K�pek bet�lt�s�nek k�nyszer�t�se HTML levelekben"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Tov�bb�t�s"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Tov�bb�t�s mint"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Tov�bb�t�s _mell�kletk�nt"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Tov�bb�t�s _be�gyazottk�nt"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Tov�bb�t�s _id�zetk�nt"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "A kijel�lt lev�l tov�bb�t�sa az �j lev�l t�rzs�ben"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "A lev�l tov�bb�t�sa id�zetk�nt, ahogy a v�laszban szok�s"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek mell�kletk�nt"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Sz�vegf�jl beilleszt�se..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "_K�pek bet�lt�se"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "A kijel�lt leveleket elolvasottnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "A kijel�lt leveleket fontosnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "A kijel�lt leveleket olvasatlannak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "A kijel�lt leveleket nem fontosnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "A kijel�lt leveleket t�rl�sre jel�li ki"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "�thelyez�s"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "A kijel�lt levelek �thelyez�se egy m�sik mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "K�vetkez�"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "K�vetkez� fontos lev�l"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "K�vetkez� lev�l"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "K�vetkez� sz�l"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "K�vetkez� olvasatlan lev�l"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Az kijel�lt lev�l megnyit�sa �j ablakban"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "A kijel�lt lev�l megnyit�sa a szerkeszt�ben �jrak�ld�s c�lj�b�l"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "El�n�zeti k�pet ad a nyomtatand� lev�lr�l"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "El�z�"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "El�z� fontos lev�l"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "El�z� lev�l"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "El�z� olvasatlan lev�l"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Lev�l nyomtat�sa"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "V�lasz"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "V�lasz mindenkinek"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr "_Keres�s a lev�lben..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Lev�l ment�se sz�vegf�jlk�nt"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Sz�veg keres�se a megjelen�tett lev�l t�rzs�ben"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Oldalbe�ll�t�s az aktu�lis nyomtat�hoz"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Lev�l forr�s�nak mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Teljes _fejl�c mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Lev�l megjelen�t�se a szok�sos st�lusban"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Lev�l megjelen�t�se a teljes fejl�ccel"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "Lev�l nyers forr�s�nak mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "A kijel�lt levelek t�rl�s�nek visszavon�sa"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelez�list�ra..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _felad�ra..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _c�mzettekre..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _t�rgyra..."
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Sz�r�k alkalmaz�sa"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "_M�sol�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "Sz�r� _gy�rt�sa lev�lb�l"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "Lev�l _tov�bb�t�sa"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Szem�lyh�v�"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Lev�l _megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "�_thelyez�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "_Szok�sos megjelen�t�s"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "Lev�l _megnyit�sa"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Eszk�z�k"
@@ -13244,7 +13525,7 @@ msgstr "Ablak bez�r�sa"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Bez�r�s"
@@ -13275,11 +13556,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Lev�l titkos�t�sa S/MIME titkos�t�si tan�s�tv�nnyal"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_orm�tum"
+#, fuzzy
+msgid "For_mat"
+msgstr "Form�tum"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13327,7 +13610,7 @@ msgid "Save in folder..."
 msgstr "Ment�s mapp�ba..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Az aktu�lis f�jl ment�se"
 
@@ -13420,7 +13703,7 @@ msgid "_From Field"
 msgstr "_Felad� mez�"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Beilleszt�s"
 
@@ -13436,7 +13719,7 @@ msgstr "_V�laszc�m mez�"
 msgid "_Security"
 msgstr "_Biztons�g"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_S�g�"
 
@@ -13672,10 +13955,6 @@ msgstr "_Ind�t�ikon"
 msgid "_Shortcut Bar"
 msgstr "_Ind�t�s�v"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "K_apcsolat n�lk�li munka"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Az �sszefoglal� be�ll�t�sainak megv�ltoztat�sa"
@@ -13750,132 +14029,136 @@ msgstr ""
 "id�z�n�t.\n"
 "A kicsiny�t�shez haszn�ld a jobb eg�rgombot."
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Aktu�lis n�zet"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "N�zet megad�sa"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "HKSCPSV"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Most"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Ma"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A id�t a k�vetkez� form�ban kell be�rni: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "A sz�zal�kos �rt�k 0 �s 100 k�z�tt lehet."
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balti"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "K�z�p-eur�pai"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "K�nai"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirill"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "G�r�g"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Jap�n"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreai"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "T�r�k"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Nyugat-eur�pai"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Hagyom�nyos"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Egyszer�s�tett"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukr�n"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "�j"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ismeretlen karakterk�szlet: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Add meg a haszn�land� karakterk�szlet: "
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "M�s..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Karakterk�dol�s"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Keres�sszerkeszt�"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Keres�s ment�se"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Hozz�ad�s a mentett keres�sekhez"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "T�rl�s"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Mutasd mind"
 
@@ -13918,18 +14201,157 @@ msgstr "A Personal Addressbook Server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "A Personal Calendar Server; napt�r factory"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nem siker�lt a GNOME-VFS inicializ�l�sa"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
+#~ 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 "
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Figyelmeztet�s a tal�lkoz�ra, amely %s-kor kezd�dik"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Figyelmeztet�s a tal�lkoz�ra, amely %s-kor v�gz�dik"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Figyelmeztet�s a tal�lkoz�ra"
+
+#~ 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"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Figyelmeztet�s a feladatra, amely %s-kor kezd�dik"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Figyelmeztet�s a feladatra, amely %s-kor v�gz�dik"
+
+#~ msgid "Notification about your task"
+#~ msgstr "Figyelmeztet�s a feladatra"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Riaszt�s id�pontja: %Y %b %d, %A, %H:%M"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "%s ismeretlen id�pontban"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_M�sok megh�v�sa"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Bizalmas"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail maildir-form�tum� f�jlok"
+
+#~ msgid "Summarising folder"
+#~ msgstr "Mappa�sszefoglal� k�sz�t�se"
+
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "A mappa megnyit�sa sikertelen: %s: �sszegz�s ett�l a poz�ci�t�l: %ld: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Nem siker�lt %s mappa �sszefoglal�j�t elk�sz�teni: %s."
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "Mindig titkos�t nekem is, ha tikos�tott levelet k�ld�k"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Nincs be�ll�tva GPG/PGP program."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "A titkos�tott �zenet nem jelenik meg"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Titkos�tott �zenet"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "A titkos�t�s visszafejt�s�hez kattints az ikonra."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Nem siker�lt mapp�t �nmag�ra m�solni."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "LHBP:LHSY"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "LHBP:LHSY"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "A mappan�v nem tartalmazhatja a k�nyvt�relv�laszt�t."
+
+#~ msgid "Ximian Evolution"
+#~ msgstr "Ximian Evol�ci�"
+
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "A Ximian Evol�ci� egy munkacsoport program \n"
+#~ "levelez�shez, napt�r �s c�mjegyz�k funkci�kkal\n"
+#~ "a GNOME grafikus k�rnyezethez."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evol�ci� %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evol�ci� %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Szia! K�sz�nj�k, hogy let�lt�tted az Ximian Evol�ci� csoportmunka-"
+#~ "szoftver\n"
+#~ "el�zetes verzi�j�t.\n"
+#~ "\n"
+#~ "A Ximian Evol�ci� m�g nincs k�sz. M�r k�zel van a befejez�shez, de "
+#~ "vannak\n"
+#~ "olyan r�szek, amelyek hi�nyoznak vagy csak f�lig m�k�dnek. \n"
+#~ "\n"
+#~ "A hib�t tal�lsz, jelentsd a bugzilla.ximian.com-on.\n"
+#~ "Erre a term�kre nem vonatkozik semmilyen garancia, �s nem\n"
+#~ "val� idegesked�sre hajlamos embereknek.\n"
+#~ "\n"
+#~ "Rem�lj�k, �lvezni fogod a kem�ny munk�nk eredm�ny�t, �s v�rjuk\n"
+#~ "hozz�j�rul�sod! \n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "K�sz�nettel\n"
+#~ "A Ximian Evol�ci� Csapat\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_orm�tum"
+
 #~ msgid "<b>Summary:</b> %s<br><br>"
 #~ msgstr "<b>�sszefoglal�:</b> %s<br><br>"
 
@@ -14005,10 +14427,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "F�jl _import�l�sa..."
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "napt�rinform�ci�"
-
-#, fuzzy
 #~ msgid "_Free/Busy Information:"
 #~ msgstr "Szabad/foglalt inform�ci�"
 
@@ -14084,9 +14502,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "There was an error downloading news feed"
 #~ msgstr "Hiba t�rt�nt a h�rforr�s let�lt�se k�zben."
 
@@ -14135,9 +14550,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Pine mail"
 #~ msgstr "Pine lev�l"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Factory az Evol�ci� levelez�komponens sz�m�ra."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Tov�bb�tott lev�l:\n"
 
@@ -14542,12 +14954,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Delegated From:"
 #~ msgstr "A feladatot kiadta:"
 
-#~ msgid "No one"
-#~ msgstr "Senki"
-
-#~ msgid "Task"
-#~ msgstr "Feladat"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "S_z�zal�kos k�szenl�t:"
 
@@ -14731,12 +15137,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Print message to the printer"
 #~ msgstr "Lev�l nyomtat�sa a nyomtat�n"
 
-#~ msgid "File not found"
-#~ msgstr "Nem tal�lom a f�jlt"
-
-#~ msgid "Open calendar"
-#~ msgstr "Napt�r megnyit�sa"
-
 #~ msgid "Save calendar"
 #~ msgstr "Napt�r ment�se"
 
@@ -14839,9 +15239,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Show a dialog"
 #~ msgstr "�zenetablak megjelen�t�se"
 
-#~ msgid "Percent complete"
-#~ msgstr "Sz�zal�kos k�szenl�t"
-
 #~ msgid "Elm Aliases"
 #~ msgstr "Elm �lnevek"
 
@@ -14972,15 +15369,9 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Az �sszetev� t�rl�se siker�lt."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Ez a napt�r�sszetev� nem felismerhet�."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Hozz�ad�s a napt�rhoz"
 
-#~ msgid " Tentative "
-#~ msgstr " K�s�rleti "
-
 #~ msgid "Update Calendar"
 #~ msgstr "Napt�r friss�t�se"
 
diff --git a/po/it.po b/po/it.po
index 370263e975..e902391207 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-10-22 13:57-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-09-29 10:08-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Fabbrica per importare i file VCard in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importa i file VCard in Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Fabbrica per importare i file VCard in Evolution."
@@ -21,291 +31,296 @@ msgstr "Fabbrica per importare i file VCard in Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa i file VCard in Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Memorizza Come"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Princ"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Uff"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Ditta"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Ditta"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Fax Uff"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Uff 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: mail/mail-config.glade.h:51
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Sito Internet"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Dipartimento"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Dip"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Uff"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Posizione"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Professione"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Man"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Nick"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI Calendario"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "FBUr"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Anniversario"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Anniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Data di nascita"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorie"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Cognome"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Tessera:"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +328,7 @@ msgstr ""
 "\n"
 "Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,7 +336,7 @@ msgstr ""
 "\n"
 " Prefisso:"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -329,7 +344,7 @@ msgstr ""
 "\n"
 " Dato:"
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 " Addizionale:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 " Famigila:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 " Suffisso:"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "Indirizzo:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,13 +392,13 @@ msgstr ""
 "\n"
 " Casella Postale: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -391,7 +406,7 @@ msgstr ""
 "\n"
 " Via:   "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -399,7 +414,7 @@ msgstr ""
 "\n"
 " Citt�:     "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -407,7 +422,7 @@ msgstr ""
 "\n"
 " Regione:       "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -415,7 +430,7 @@ msgstr ""
 "\n"
 " Codice di avviamento postale:  "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -423,7 +438,7 @@ msgstr ""
 "\n"
 " Stato:    "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -431,7 +446,7 @@ msgstr ""
 "\n"
 "Etichetta di spedizione: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -439,7 +454,7 @@ msgstr ""
 "\n"
 " Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -447,7 +462,7 @@ msgstr ""
 "\n"
 "Telefono:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -455,7 +470,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -463,7 +478,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -471,7 +486,7 @@ msgstr ""
 "\n"
 "Programma di posta: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -479,7 +494,7 @@ msgstr ""
 "\n"
 "Fuso orario: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -487,7 +502,7 @@ msgstr ""
 "\n"
 "Posizione Geografica: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -495,7 +510,7 @@ msgstr ""
 "\n"
 "Occupazione:"
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -503,7 +518,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -511,7 +526,7 @@ msgstr ""
 "\n"
 " Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -519,7 +534,7 @@ msgstr ""
 "\n"
 " Unit�:"
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -527,7 +542,7 @@ msgstr ""
 "\n"
 " Unit�2:"
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -535,7 +550,7 @@ msgstr ""
 "\n"
 " Unit�3:"
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -543,7 +558,7 @@ msgstr ""
 "\n"
 " Unit�4:"
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -551,7 +566,7 @@ msgstr ""
 "\n"
 "Categorie:"
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -569,7 +584,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -577,7 +592,7 @@ msgstr ""
 "\n"
 "Stringa Unica: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -585,11 +600,11 @@ msgstr ""
 "\n"
 "Chiave Pubblica: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "VCard  Multiple"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -598,16 +613,18 @@ msgstr "VCard 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:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1384
-#: calendar/conduits/todo/todo-conduit.c:1064
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
@@ -620,60 +637,60 @@ msgstr "Caricamento in corso..."
 msgid "Error in search expression."
 msgstr "Errore nel criterio di ricerca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Connessione al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Impossibile connettersi al server LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "In attesa di connesione al server LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Aggiunta di una card al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Rimozione di una card dal server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modifica di una card nel server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Riavvio della ricerca in corso."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Il cursore non pu� essere caricato\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:940
-#: calendar/conduits/todo/todo-conduit.c:639
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:941
-#: calendar/conduits/todo/todo-conduit.c:640
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
@@ -717,39 +734,39 @@ msgstr "Fabbrica per il popup di indirizzi della Rubrica"
 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:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Cartella contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Nuova _Lista di Contatti"
 
@@ -782,7 +799,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Di base"
 
@@ -870,16 +887,16 @@ msgstr "Nome dell' _Account:"
 #: 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:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Aggiungi"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Modifica"
@@ -896,15 +913,20 @@ msgstr "_Porta:"
 msgid "_Server name:"
 msgstr "Nome del _Server:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Impossibile inizializzare gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +936,7 @@ msgstr ""
 "che � stata inserita una URI errata,\n"
 "oppure che il server LDAP non funziona"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -926,7 +948,7 @@ msgstr ""
 "bisogna compilare il programma dai sorgenti CVS dopo\n"
 "aver scaricato Open LDAP dal link sottostante.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -934,42 +956,42 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Digitare la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "La categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avanzato..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Qualunque Categoria"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -982,51 +1004,51 @@ msgstr "La URI visualizzata dal Browser delle cartelle"
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Email principale"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Selezionare una Azione"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crea un nuovo contatto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Aggiungi indirizzo al contatto esistente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Interrogazione Rubrica..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Modifica Informazioni del Contatto"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Aggiungi ai Contatti"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Unisci Indirizzo Email"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Disabilita Query"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abilita Query (Pericoloso!)"
 
@@ -1038,35 +1060,35 @@ msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Rimuovere"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Rimuovere Tutti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Invio posta in HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Modifica la Lista dei Contatti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Lista di Contatti senza nome"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d non mostrati)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Contatto senza nome"
 
@@ -1080,7 +1102,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Seleziona Contatti dalla Rubrica"
 
@@ -1140,12 +1170,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Dettagli"
 
@@ -1212,8 +1242,8 @@ msgstr "_Contatti..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1449 mail/mail-config.glade.h:95
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1283,46 +1313,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un Contatto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Modifica Interamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Nome e cognome"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2390,7 +2420,7 @@ msgid "contact-list-editor"
 msgstr "Editor della lista dei Contatti"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Editor della Lista dei Contatti"
 
@@ -2439,13 +2469,13 @@ msgstr ""
 "L'indirizzo email o il nome di questo contatto esistono\n"
 " gi� in questa cartella. Aggiungere comunque?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Ricerca Avanzata"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Cerca"
 
@@ -2464,9 +2494,9 @@ msgstr "%d card"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/widgets/e-addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come VCard"
@@ -2477,18 +2507,18 @@ msgid "Open"
 msgstr "Apri"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contatto Precedente"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:764
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Invia un Messaggio al Contatto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:765
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2496,94 +2526,99 @@ msgid "Print"
 msgstr "Stampa"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:767
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Stampa Busta"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:769 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errore nella modifica della card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:944
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Completato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1785
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:981
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Card non trovata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "ID della card gi� esistente"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1270
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Salvare le modifiche?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Errore nell'aggiungere una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Errore nella modifica della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Errore nella rimozione della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1307
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Errore nella rimozione di una card"
 
 #. 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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2591,84 +2626,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Cliccare qui per aggiungere un contatto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Telefono Principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Telefono Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Telefono Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Telefono a cui Richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Telefono Ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telefono di Casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Indirizzo Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Indirizzo di Casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Telefono Ufficio 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telefono Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Altro Telefono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Altro Indirizzo"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2854,96 +2889,111 @@ msgstr "Larghezza:"
 msgid "_Font..."
 msgstr "_Carattere..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Stampa card"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Stampa card"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Stampa busta"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Modifica appuntamenti"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Altezza"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1711
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normale"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Basso"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Non definito"
 
-#: calendar/conduits/calendar/calendar-conduit.c:896
-#: calendar/conduits/todo/todo-conduit.c:594
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1018
-#: calendar/conduits/calendar/calendar-conduit.c:1021
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
-#: calendar/conduits/todo/todo-conduit.c:698
-#: calendar/conduits/todo/todo-conduit.c:701
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visore iTip/iMip del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Componente di Evolution per gestire il calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Fabbrica per il componente del Sommario del Calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabbrica per il controllo della vista iTip del calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabbrica per il controllo del Calendario di esempio"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Fabbrica per centralizzare il componente dell'editor dei dialoghi del "
 "calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabbrica per creare una fabbrica di editor di componenti"
 
@@ -2955,21 +3005,27 @@ 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:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Inizio:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Fine:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Argomento non valido"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Avviso Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:350
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Avviso alle %A %b %d %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Avvisi Sonoro"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -2988,11 +3044,11 @@ msgstr "Suoneria (minuti)"
 msgid "_Edit appointment"
 msgstr "_Modifica appuntamenti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:663
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:723
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3000,7 +3056,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:774
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3011,142 +3067,116 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Impossibile inizializzare GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Impossibile inizializzare gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Impossibile inizializzare il servizio di notifica"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
 
-#: calendar/gui/calendar-model.c:410 calendar/gui/calendar-model.c:1017
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:413 calendar/gui/calendar-model.c:1019
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:416 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:509
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:509
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:511
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:511
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1216
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Libero"
 
-#: calendar/gui/calendar-model.c:579 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:401 shell/evolution-shell-component.c:966
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Occupato"
 
-#: calendar/gui/calendar-model.c:728 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:731 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Completato"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:931 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:934 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:939
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La data deve essere inserita nel formato:\n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1103
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3156,59 +3186,55 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1143
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1262 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1448
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "No"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2010 calendar/gui/e-day-view.c:1674
-#: calendar/gui/e-week-view.c:1181
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Ricerca"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista giornaliera"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Vista della Settimana Lavorativa"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Vista settimanale"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Vista mensile"
 
@@ -3228,23 +3254,23 @@ msgstr "Commento contiene"
 msgid "Unmatched"
 msgstr "Non c'� corrispondenza"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Cartella contenente appuntamenti ed eventi"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Obiettivi"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
@@ -3252,7 +3278,7 @@ msgstr "Cartella contente le cose da fare"
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3440
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nuovo _Appuntamento"
 
@@ -3265,7 +3291,7 @@ msgstr "Crea un nuovo obiettivo"
 msgid "New _Task"
 msgstr "Nuovo _Obiettivo"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzer�"
 
@@ -3335,115 +3361,110 @@ msgstr "Ore"
 msgid "minutes"
 msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d giorni"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 giorno"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d settimane"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 settimana"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 ora"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 secondo"
 
-#: calendar/gui/dialogs/alarm-page.c:371
+#: 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:375
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Visualizza un messaggio"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Invia un email"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: 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:389
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: 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:404
+#: 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:409
+#: 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:418
+#: 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:421
+#: 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:426
+#: 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:437
-#, fuzzy, c-format
-msgid "%s at an unknown time"
-msgstr "un mittente sconosciuto"
-
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s server %s"
 
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3464,7 +3485,7 @@ msgstr "Promemoria"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:683 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -3494,7 +3515,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -3547,7 +3568,7 @@ msgid "First day of wee_k:"
 msgstr "Primo giorno della _settimana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Venerd�"
 
@@ -3560,7 +3581,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Luned�"
 
@@ -3569,7 +3590,7 @@ msgid "O_verdue tasks:"
 msgstr "O_biettivi scaduti:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -3590,7 +3611,7 @@ msgid "Su_n"
 msgstr "D_om"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -3607,7 +3628,7 @@ msgid "Tas_ks due today:"
 msgstr "Scadenze per oggi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Gioved�"
 
@@ -3628,12 +3649,12 @@ msgid "Time format:"
 msgstr "Formato del tempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Marted�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Mercoled�"
 
@@ -3702,120 +3723,125 @@ msgstr "_Mer"
 msgid "before the start of the appointment"
 msgstr "prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Lo status della riunione � cambiato.  Inviare una versione aggiornata?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sicuro di voler annullare e cancellare questo appuntamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sei sicuro di voler annullare e cancellare quest'obiettivo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sei sicuro di voler annullare e cancellare questa voce dell'agenda?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Questo evento � stato cancellato."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Questo obiettivo � stato cancellato."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Questa voce dell'agenda � stata cancellata."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s sono state effettuate delle modifiche.  Dimenticare queste modifiche e "
 "chiudere l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s non sono state effettuate modifiche, chiudere l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Questo evento � stato modificato."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Questo obiettivo � stato modificato."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Questa voce dell'agenda � stata modificata."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s sono state effettuate delle modifiche.  Dimenticare queste modifiche ed "
 "aggiornare l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s non sono state effettuate modifiche.  Aggiornare l'editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " a"
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Scadenza "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Impossibile aggiornare i file correttamente"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Obiettivo - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Niente indice"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1812
-#: mail/mail-display.c:101
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1819
-#: mail/mail-display.c:105
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3823,53 +3849,53 @@ msgstr ""
 "Esiste gi� un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ottenere la versione corrente!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sei sicuro di voler cancellare %d appuntamenti?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sei sicuro di voler cancellare %d obiettivi?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sei sicuro di voler cancellare %d voci dell'agenda?"
@@ -3886,26 +3912,26 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire Delegato"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Pianifica una _Riunione"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Riunione"
 
@@ -3924,11 +3950,12 @@ msgid "Classification"
 msgstr "Classificazione"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Con_fidenziale"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data e Ora"
 
@@ -3937,12 +3964,12 @@ msgid "F_ree"
 msgstr "Libe_ro"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
@@ -3952,7 +3979,7 @@ msgid "Show Time As"
 msgstr "Mostra ora come"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
@@ -3964,16 +3991,21 @@ msgstr "Ora di _fine:"
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 #, fuzzy
 msgid "An organizer is required."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "� necessario impostare un organizer."
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Questa persona sta gi� partecipando alla riunione!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
@@ -4014,6 +4046,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4032,7 +4065,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:86
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4047,35 +4080,36 @@ msgid "_Change Organizer"
 msgstr "_Cambia Organizzatore"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Invita Altri"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Invita altri..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Altro Organizzatore"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non pu� modificare."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "giorno"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "ricorrenze"
 
@@ -4139,23 +4173,19 @@ msgstr "Settimana(e)"
 msgid "year(s)"
 msgstr "anno(i)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Salvare le modifiche?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Le informazioni per la riunione sono cambiate.  Inviare una versione "
 "aggiornata?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Le informazioni per l'obiettivo sono cambiate.  Inviare una versione "
 "aggiornata?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "La voce dell'agenda � cambiata.  Inviare una versione aggiornata?"
 
@@ -4174,7 +4204,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4186,138 +4216,169 @@ msgstr "_Priorit�:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:27
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Data di _inizio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Confidenziale"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3461
-#: calendar/gui/e-week-view.c:3313 mail/folder-browser.c:1428
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Cancella il contatto selezionato"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Apri"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3470
-#: calendar/gui/e-week-view.c:3322 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3472
-#: calendar/gui/e-week-view.c:3324 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3447
-#: calendar/gui/e-day-view.c:3474 calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3326 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Elimina questo Obiettivo"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina gli Obiettivi Selezionati"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Fare clic qui per aggiungere un obiettivo"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"La data deve essere inserita nel formato:\n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Completato"
 
@@ -4348,8 +4409,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Indice"
 
@@ -4361,354 +4422,411 @@ msgstr "Ordina Obiettivi"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nuovo _Evento dell'Intera Giornata"
 
-#: calendar/gui/e-day-view.c:3452 calendar/gui/e-week-view.c:3305
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3307
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3463 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Elimina questo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3482 calendar/gui/e-week-view.c:3340
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "_Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3484 calendar/gui/e-week-view.c:3342
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3486 calendar/gui/e-week-view.c:3344
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Elimina _Tutte le Ricorrenze"
 
-#: calendar/gui/e-itip-control.c:473
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:478
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:487
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:500
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Meeting ends: <b>"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-itip-control.c:503
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:519
+#: calendar/gui/e-itip-control.c:571
 #, fuzzy
 msgid "Task Completed: <b>"
 msgstr " (Completato "
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informazioni sul calendario"
+
 #. Title
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendario"
 
-#: calendar/gui/e-itip-control.c:644 calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 #, fuzzy
 msgid "An unknown person"
 msgstr "un mittente sconosciuto"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:683
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Selezionare una Azione"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "era dopo"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Accettata"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Tentativo"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Annullato"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "_Rende note le Informazioni sulla Disponibilit�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informazione"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annulla"
+
+#: calendar/gui/e-itip-control.c:867
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Ottieni le informazioni sull'ultima riunione"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informazioni Opzionali"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Riunione"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:882
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Ottieni le informazioni sull'ultima riunione"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Riunione"
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selezionare una Azione"
 
-#: calendar/gui/e-itip-control.c:755 calendar/gui/e-itip-control.c:803
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Trova nel Messaggio"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:917
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Ottiene le ultime informazioni sull'obiettivo"
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Informazione"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "era dopo"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:932
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Ottiene le ultime informazioni sull'obiettivo"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Rispondi"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Annulla Operazione"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Messaggio del Calendario"
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:973
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Free-busy URL"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Free-busy URL"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio Precedente"
 
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:1052
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Impossibile rimuovere oggetto  dal file del calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4749,216 +4867,211 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Partecipanti Richiesti"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Partecipanti Opzionali"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Non Partecipanti"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuale"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Gruppo"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Risorse"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Stanza"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:691
-#: calendar/gui/e-meeting-model.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521 calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Partecipante Richiesto"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Partecipante Opzionale"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Non Partecipante"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529 calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Richiede Azione"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Accettata"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Annullato"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:735 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Tentativo"
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
-#: calendar/gui/e-meeting-model.c:736
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegato"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "In Corso"
 
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1465
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1420
-#: calendar/gui/e-meeting-model.c:1467
-msgid "Required Participants"
-msgstr "Partecipanti Richiesti"
-
-#: calendar/gui/e-meeting-model.c:1354 calendar/gui/e-meeting-model.c:1469
-msgid "Optional Participants"
-msgstr "Partecipanti Opzionali"
-
-#: calendar/gui/e-meeting-model.c:1355 calendar/gui/e-meeting-model.c:1471
-msgid "Non-Participants"
-msgstr "Non Partecipanti"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:402
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Assente"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "_Invite Others..."
-msgstr "_Invita altri..."
-
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna Disponibilit�"
 
-#: calendar/gui/e-meeting-time-sel.c:505
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Tutto il Personale e le Risorse"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: calendar/gui/e-meeting-time-sel.c:634
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura archivio %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare l'obiettivo in `%s'"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 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:3293 calendar/gui/e-week-view.c:3331
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nuovo _Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
 
-#: calendar/gui/gnome-cal.c:1678
+#: calendar/gui/gnome-cal.c:1865
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Apertura cartella %s"
@@ -5019,230 +5132,275 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Impossibile creare la fabbrica per l'editor dei componenti"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Giorno selezionato (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Settimana selezionata (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Mese  selezionato (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "_Obiettivo"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Status:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorit�:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Completato in data:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Categorie:"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Co_ntatti:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2241 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Stampa oggetto"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella degli obiettivi da visualizzare"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Impossibile creare la vista del calendario.  Controllare le impostazioni di "
+"ORBit e di OAF"
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5250,7 +5408,7 @@ msgstr ""
 "Evolution ha preso gli impegni che erano nella cartella del calendario e li "
 "ha automaticamente spostati nella nuova cartella degli impegni."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5262,7 +5420,7 @@ msgstr ""
 "Alcuni obiettivi potrebbero non essere stati spostati e quindi questo "
 "precesso potrebbe essere ritentato in futuro."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5271,7 +5429,7 @@ msgstr ""
 "Impossibile aprire `%s'; nessun oggetto della cartella del calendario sar� "
 "spostato nella cartella degli obiettivi."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5280,83 +5438,83 @@ msgstr ""
 "Il metodo richiesto per caricare `%s' non � supportato; nessun oggetto della "
 "cartella del calendario sar� spostato nella cartella degli obiettivi."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now prevede 0 argomenti"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time prevede 1 argomento"
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa ISO 8601 data/ora"
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day prevede 2 argomenti"
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day prevede che l'argomento 1 sia un intero"
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin prevede 1 argomento"
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end prevede 1 argomento"
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype prevede 0 argomenti"
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? prevede che l'argomento 2 sia un time_t"
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contiene? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contiene? prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contiene? prevede che l'argomento 2 sia una stringa"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5364,11 +5522,11 @@ msgstr ""
 "contiene? prevede che l'argomento 1 sia \"qualsiasi\", \"indice\", "
 "\"descrizione\""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "ha categorie? prevede almeno 1 argomento"
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5376,21 +5534,21 @@ msgstr ""
 "ha categorie? prevede che tutti gli argomenti siano stringhe e che uno solo "
 "sia booleano falso (#f)"
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "� completo? prevede 0 argomenti"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "� completo? prevede 0 argomenti"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La valutazione dell'espressione di ricerca non ha restituito un valore "
@@ -5416,7 +5574,7 @@ msgstr "Questo numero non supporta la crittazione"
 msgid "Decryption is not supported by this cipher"
 msgstr "Questo numero non supporta la decrittazione"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5427,7 +5585,7 @@ msgstr ""
 "Ulteriori operazioni su questo server non saranno ripetute\n"
 "quando ci si riconnette alla rete."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5438,15 +5596,15 @@ msgstr ""
 "%s\n"
 "Le modifiche fatte a questa cartella non saranno risincronizzate."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Sincronizzazione con il server"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "� necessario essere collegati per completare questa operazione"
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
@@ -5472,58 +5630,58 @@ msgstr "Errore al messaggio %d"
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Errore nell'esecuzione della ricerca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Sposta messaggii in %s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5532,7 +5690,7 @@ msgstr ""
 "Impossibile filtrare l'espressione di ricerca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5541,7 +5699,7 @@ msgstr ""
 "Errore nell'esecuzione della ricerca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) richiede un singolo risultato booleano"
 
@@ -5550,103 +5708,103 @@ 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:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Impossibile bloccare '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Impossibile creare il file di blocco per %s; %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Tempo scaduto nel tentativo di prendere il file di lock %s.  Riprovare pi� "
 "tardi."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Rimozione del lock usando fcntl(2) non riuscita: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Rimozione del lock usando flock(2) non riuscita: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Impossibile controllare il file di posta %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Impossibile aprire il file di posta %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Impossibile aprire il file di posta temporaneo %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fallita l'archiviazione della posta nel file temporaneo %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Impossibile ridirigere: %s  "
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Impossibile fare un fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Fallito lo spostamento della posta: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Errore sconosciuto)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Errore nella lettura del file di posta: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Errore nella scrittura del file temp di posta: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella copia del file temp di posta: %s"
@@ -5661,90 +5819,90 @@ msgstr "Digitare la %s passphrase per %s"
 msgid "Please enter your %s passphrase"
 msgstr "Digitare la %s passphrase"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, 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:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, 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:728
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, 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:937
+#: camel/camel-pgp-context.c:956
 #, 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:1104
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 #, 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:1121
+#: camel/camel-pgp-context.c:1146
 #, 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:1130
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Impossibile caricare %s: Caricamento modulo non supprotato da questo "
 "sistema. "
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Impossibile caricare %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
@@ -5764,7 +5922,7 @@ msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
@@ -5774,12 +5932,12 @@ msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si � disconnesso inaspettatamente: %s"
@@ -5885,7 +6043,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -5903,8 +6061,8 @@ msgid "Unknown authentication state."
 msgstr "Stato di Autenticazione sconosciuto."
 
 #: 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/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Password"
 
@@ -5934,55 +6092,55 @@ msgstr "autorizzazione POP prima di SMTP usando una sorgente non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: 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:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sto risolvendo: %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Errore nella ricerca del nome: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Fornitore di cartelle email virtuali "
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6028,17 +6186,17 @@ msgstr "Decodifica messaggio non riuscita."
 msgid "Failed to verify certificates."
 msgstr "Verifica certificati non riuscita."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossibile creare una cartella di lock in %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossibile creare una cartella di lock in %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6048,7 +6206,7 @@ msgstr ""
 "Oggetto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6062,7 +6220,7 @@ msgstr ""
 "%s\n"
 "Accettare comunque?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6081,41 +6239,41 @@ msgstr ""
 "Stato: %s\n"
 "Nazione: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Impossibile smistare URL `%s'"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Impossibile cancellare la cartella:\n"
 "%s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Impossibile cancellare la cartella:\n"
 "%s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
@@ -6148,57 +6306,57 @@ msgstr "La risposta del server IMAP non contiene informazione %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Questo messaggio non � al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Impossibile aprire la directory cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Decodifica messaggio non riuscita."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
 
@@ -6206,7 +6364,7 @@ msgstr "Controllo nuova posta"
 msgid "Check for new messages in all folders"
 msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:837
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -6240,28 +6398,28 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, 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:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6272,91 +6430,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non � permesso contenere sottocartelle"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Formato MH di UNIX delle directory della posta"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Consegne locali"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Per ricevere la posta locale da mbox formato standard."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Applicare filtri ai nuovi messaggi nella INBOX su questo server"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Formato MH di UNIX delle directory della posta"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "Per archiviare la posta locale nelle directory qmail maildir."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "File di spool standard per Unix"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Per leggere earchiviare la posta in file spool standard mbox."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
@@ -6367,29 +6527,29 @@ msgid "Could not save summary: %s: %s"
 msgstr "Impossibile caricare l'indice per %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Errore al messaggio %d"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6398,20 +6558,20 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6420,15 +6580,15 @@ msgstr ""
 "Impossibile aprire la cartella `%s':\n"
 "%s "
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6437,19 +6597,19 @@ msgstr ""
 "Impossibile creare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � una directory maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "non � una directory maildir"
 
@@ -6464,34 +6624,34 @@ msgstr "Impossibile esaminare la cartella `%s':%s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossibile creare una cartella di lock in %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operazione annullata"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6500,17 +6660,17 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6519,7 +6679,7 @@ msgstr ""
 "Impossibile il file %s:\n"
 "%s "
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6528,14 +6688,14 @@ msgstr ""
 "Impossibile creare il file `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non � un file regolare."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6544,110 +6704,113 @@ msgstr ""
 "Impossibile cancellare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non � vuota.  Non cancellata."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Salvataggio della cartella in corso"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossibile aprire la cartella %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Errore fatale di simistamento della posta vicino alla posizione %ld nella "
 "cartella %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossibile controllare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossibile aprire il file: %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Indice e cartella non corrispondono, nemmeno dopo una sincronizzazione"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Invia un messaggio al contatto"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non � una directory."
@@ -6657,67 +6820,49 @@ msgstr "`%s' non � una directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file spool: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool `%s' non esiste oppure non � un file regolare."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La cartella `%s/%s' non esiste."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "File spool di posta %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Le cartelle spool non possono essere cancellate"
 
-#. 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 "Creazione indice della cartella"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Impossibile aprire la cartella: %s: indice creato a partire dalla posizione %"
-"ld: %s "
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Impossibile creare indice per la cartella: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Impossibile sincronizzare cartella temporanea %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Impossibile sincronizzare cartella spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6726,67 +6871,67 @@ msgstr ""
 "Impossibile sincronizzare cartella spool %s: %s\n"
 "La cartella potrebbe essere corrotta, copia salvata in `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Impossibile trovare il file %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Inserire la passwoed NNTP di %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Username rifiutato dal server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Fallito l'invio dello username al server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Il server ha rifiutato username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Messaggio %s non trovato."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Impossibile prendere la lista dei gruppi dal server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Impossibile caricare il file con la lista dei gruppi di %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Questo � un fornitore per la lettura e l'invio a newsgroups USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Impossibile aprire la directory per il news server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6794,71 +6939,71 @@ msgstr ""
 "Con questa opzione l'autenticazione con il server NNTP avviene usando una "
 "password in testo semplice."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Ricezione indice POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Impossibile controllare nuovi messaggi sul server POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Eliminazione definitiva dei messaggi eliminati"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Impossibile scaricare il messaggio: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nessun messaggio con uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Ricezione messaggio POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Archiviazione del messaggio"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Lasciare i messaggi sul server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Elimina dopo %s giorno(i)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Per connettersi e scaricare la posta da server POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6866,7 +7011,7 @@ msgstr ""
 "Con questa opzione ci si connette al server POP usando una password in testo "
 "semplice. Questa � la sola opzione supportata da molti server POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6876,34 +7021,34 @@ msgstr ""
 "attraverso il protocollo APOP.  Potrebbe non funzionare per tutti gli utenti "
 "anche su server che affermano di supportarlo. "
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Con questa ci si connette al server POP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Impossibile autenticare il KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Impossibile connettersi al server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPrego inserire la password del POP3 di %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6912,12 +7057,12 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio dello username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6925,7 +7070,7 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non � presente il supporto per il meccaniscmo di autenticazione richiesto."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6934,22 +7079,22 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Risposta inaspettata dal server POP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:73
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6957,180 +7102,180 @@ msgstr ""
 "Per consegnare la posta passandola al programma \"sendmail\" sul sistema "
 "locale."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Impossibile creare una ridirezione verso sendmail: %s: posta non inviata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Impossibile effettuare fork di sendmail: %s: posta non inviata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminato con il segnale %s: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Impossibile eseguire %s: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminato con lo status %d: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Impossibile trovare l'indirizzo 'Da' nel messaggio"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:66
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stato del sistema, o risposta di aiuto del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Messaggio di Aiuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta � corretta, completata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "L'azione di posta richiesta non � stata effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore di processo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Utente non locale; tentare <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Azione richiesta non effettuata: archivio di sistema insufficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "L'azione di posta richiesta � stata interrotta: si � ecceduta l'allocazione "
 "per l'archivio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "L'azione di posta richiesta non � stata effettuata: il nome della casella "
 "non � permesso"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inizio dell'imput della posta, termin con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transazione fallita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "� necessaria una password di transizione."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione � troppo debole"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "� richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sInserire la password SMTP per %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7141,132 +7286,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � stato "
 "definito."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Saluti SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Richiesta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Errore nella risposta MAIL FROM: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Errore nella risposta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Errore nella risposta di DATA: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Errore nella risposta di DATA: terminazione del messaggio: %s posta non "
 "inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Errore nella risposta di QUIT: %s: non fatale<"
@@ -7296,7 +7441,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:135
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "allegato"
 
@@ -7340,53 +7485,53 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7399,7 +7544,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7408,29 +7553,29 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7438,16 +7583,16 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7456,7 +7601,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7465,7 +7610,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7474,7 +7619,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7483,7 +7628,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7493,29 +7638,29 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserici File"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7524,7 +7669,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione, poich� non �\n"
 "stata ancora configurata nessuna identit� nel componente della posta."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7532,11 +7677,11 @@ msgstr ""
 "Impossibile creare una finestra di composizione, poich� non �\n"
 "stata ancora configurata nessuna identit� nel componente della posta."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7584,15 +7729,24 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Ricorda questa password"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -7651,30 +7805,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7812,7 +7966,7 @@ msgstr "Di"
 msgid "Add action"
 msgstr "Aggiungi Azione"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7821,16 +7975,16 @@ 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:233 filter/vfolder-rule.c:357
-#: mail/mail-account-gui.c:824
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Inserire la URI della Cartella"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<clicca qui per selezionare una cartella>"
 
@@ -7847,39 +8001,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "se qualche criterio � soddisfatto"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "in entrata"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "in uscita"
 
@@ -8072,7 +8226,7 @@ msgstr "Risposto a"
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1351
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Mittente"
 
@@ -8104,7 +8258,7 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Oggetto"
@@ -8117,15 +8271,15 @@ msgstr "era dopo"
 msgid "was before"
 msgstr "era prima"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regole"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Aggiungi Regola"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Modifica Regola"
 
@@ -8133,43 +8287,43 @@ msgstr "Modifica Regola"
 msgid "Score Rules"
 msgstr "Regole di punteggio"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  � necessario specificare almeno una cartella sorgente."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando la tua vecchia posra di Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importazione..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Attendere prego"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importazione di %s come %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Scansione di \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Posta"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8177,19 +8331,15 @@ msgstr ""
 "Evoluion ha trovato file di posta Elm\n"
 "Si desidera importarli in Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Rubrica"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8197,23 +8347,23 @@ msgstr ""
 "Evolution ha trovato file GnomeCard.\n"
 "Si desidera importarli in Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scansione cartella"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Inizio importazione"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8221,11 +8371,11 @@ msgstr ""
 "Evolution ha trovato file di posta Netscape.\n"
 "Si desidera importarli in Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution sta importando i vecchi dati di Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8233,7 +8383,7 @@ msgstr ""
 "Evolution ha trovato file di posta Pine.\n"
 "Si desidera importarli in Evolution"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8269,242 +8419,247 @@ msgstr "Fabbrica per il componente del Sommario della Posta"
 msgid "Mail configuration interface"
 msgstr "Interfaccia di configurazione della posta"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Cartella contente la posta"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Cartella di archiviazione posta (interna)"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Cestino Virtuale"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Cartella Cestino Virtuale"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Impossibile connettersi al server: %s"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Questa cartella non pu� contenere messaggi."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Propriet�..."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� dei questa cartella"
 
-#: mail/component-factory.c:731
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:873
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: mail/component-factory.c:873
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nuovo _Messaggio di Posta"
 
-#: mail/component-factory.c:897
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:906
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:912
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:1077
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:270
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:275 mail/mail-display.c:301
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/folder-browser.c:747
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nuovi"
 
-#: mail/folder-browser.c:750 mail/folder-browser.c:755
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:751
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d nascosti"
 
-#: mail/folder-browser.c:756
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d selezionati"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr " %d non inviati"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " %d non inviati"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/folder-browser.c:1030
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Crea una cartella virtuale dalla Ricerca"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: mail/folder-browser.c:1412
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1413
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1414
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla Mailng _List"
 
-#: mail/folder-browser.c:1418
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtra sull'_Oggetto"
 
-#: mail/folder-browser.c:1419
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtra sulla _Mailng List"
 
-#: mail/folder-browser.c:1429 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1430 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1435 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Rispondi al Mittente"
 
-#: mail/folder-browser.c:1436 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Rispondi alla _Lista"
 
-#: mail/folder-browser.c:1437 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1440 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1441 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1442
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/folder-browser.c:1450 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Aggiungi Mittente alla Rubrica"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:1609
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:1610
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1613
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Pr_edefinito"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Ricerca Informazioni Cartella"
@@ -8582,16 +8737,16 @@ msgstr "Editor dlle News di Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:949
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Impossibile creare un contesto per la firma PGP."
 
-#: mail/mail-account-gui.c:1026
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Salva firma"
 
-#: mail/mail-account-gui.c:1032
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8601,7 +8756,7 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: mail/mail-account-gui.c:1617
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "� possibile creare due account con lo stesso nome."
 
@@ -8617,52 +8772,52 @@ msgstr "Disabilita"
 msgid "Enable"
 msgstr "Abilita"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Non cancellare"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:44
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Impostazioni Posta"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail a %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Oggetto � %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail da %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-callbacks.c:140
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8674,7 +8829,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8682,7 +8837,7 @@ msgstr ""
 "� necessario configurare un' identit�\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:207
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8690,12 +8845,12 @@ msgstr ""
 "� necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Non � stato impostato un sistema di trasporto per la posta"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:265
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
@@ -8705,11 +8860,11 @@ msgstr ""
 "dei seguenti destinatari indicano che non desiderano ricevere tali "
 "messaggi:\n"
 
-#: mail/mail-callbacks.c:285
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Inviare comunque?"
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8717,7 +8872,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8726,11 +8881,11 @@ msgstr ""
 "per nascondere gli indirizzi della lista, questo messaggio contiene solo "
 "destinatari Bcc."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: mail/mail-callbacks.c:379
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8740,41 +8895,41 @@ msgstr ""
 "header simile ad A.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:473
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "questo messaggio contiene destinatari non validi."
 
-#: mail/mail-callbacks.c:508
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:604
+#: mail/mail-callbacks.c:599
 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:840
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:845
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Il %a, %Y-%m-%d alle %H:%M, %%s ha scritto:"
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:1680
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sei sicuro di voler modificare tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8782,7 +8937,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1738
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8790,28 +8945,28 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:1752
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sei sicuro di voler rispedire tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:1775
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:1863
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:1865
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2010 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Attenzine"
 
-#: mail/mail-callbacks.c:2017
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8824,11 +8979,11 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:2024
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Non chiedere pi� in futuro."
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8837,19 +8992,19 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2202
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:2248
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:2339
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Sicuro di voler aprire tutti i %d messaggi in finestre separate?"
@@ -8907,7 +9062,7 @@ msgstr ""
 "Questo nome � usato solo allo scopo di visualizzare."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
@@ -8954,60 +9109,64 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
 #: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Cifrare sempre a me stesso quando si invia posta cifrata"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:9
+#, fuzzy
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "Cifrare sempre a me stesso quando si invia posta cifrata"
 
-#: mail/mail-config.glade.h:9
-msgid "Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
 msgstr "Firmare sempre i messaggi uscenti quando si usa questo account"
 
-#: 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
-msgid "Authentication Type: "
-msgstr "Tipo di Autenticazione: "
-
 #: mail/mail-config.glade.h:13
-msgid "Certificate ID:"
-msgstr "ID del certificato:"
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Controllo nuova posta"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Composer"
 msgstr "Scrivi"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9023,230 +9182,236 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "Lo stile predefinito per inoltrare �:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Codice dei caratteri predefinito: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "ID digitali..."
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Visualizza"
 
-#: mail/mail-config.glade.h:30 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:31 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Bozze"
 
-#: mail/mail-config.glade.h:32
-msgid "Drafts folder:"
-msgstr "Cartella delle Bozze:"
-
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Prendi ID digitale..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "File con la firma HTML:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:39 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "Posta HTML"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "In linea"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Collocazione della Mailbox"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Imposta come mio account _predefinito"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP Server:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Informazioni Opzionali"
 
-#: mail/mail-config.glade.h:52
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "ID della chiave PGP:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Prendi un colore"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Ricorda questa password"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Opzioni di Ricezione"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Informazioni Richieste"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "MIME sicuro"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Sicurezza"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Scegliere un Filtro per il file di Log..."
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Invio Posta"
 
-#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Posta Inviata"
 
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Cartella dei messaggi inviati:"
+
 #: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
 #: mail/mail-config.glade.h:76
-msgid "Sent messages folder:"
-msgstr "Cartella dei messaggi inviati:"
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Il Server richiede l'_autenticazione"
 
 #: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
 #: mail/mail-config.glade.h:78
-msgid "Server Type: "
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Tipo di Server:"
 
 #: mail/mail-config.glade.h:79
-msgid "Server requires _authentication"
-msgstr "Il Server richiede l'_autenticazione"
-
-#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Sorgente"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informazione Sorgenti"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Cartelle Speciali"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:87
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "Usa connessione sicura (_SSL)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9256,103 +9421,130 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Firmare sempre i messaggi uscenti quando si usa questo account"
+
 #: mail/mail-config.glade.h:93
-msgid "_Automatically check for new mail every"
-msgstr "_Controlla la posta automaticamente ogni"
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Tipo di Autenticazione: "
 
 #: mail/mail-config.glade.h:94
-msgid "_Check for supported types"
-msgstr "_Controlla tipi supportati"
+#, fuzzy
+msgid "_Automatically check for new mail"
+msgstr "_Controlla la posta automaticamente ogni"
+
+#: mail/mail-config.glade.h:95
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ID del certificato:"
 
 #: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Cartella delle Bozze:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "Indirizzo _Email:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "_Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "File con la firma _HTML:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente � nella rubrica"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "Salva il _Log dei filtri in:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "Segna i _messaggi come Letti dopo"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organizzazione:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "Percorso binario di _PGP:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "_Percorso:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Ricorda questa password"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "_Invia la posta in formato HTML come predefinito."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Tipo di Server:"
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "_Username:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Ogni"
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "secondi."
 
@@ -9392,154 +9584,148 @@ msgstr "Imposssibile creare un contesto per la busta S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare un contesto di codifica  S/MIME."
 
-#: mail/mail-display.c:246
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:353
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:418
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:422
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:443
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:1118
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1601
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Aprei il link nel Browser"
 
-#: mail/mail-display.c:1603
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:1606
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1609
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
-#: mail/mail-format.c:634
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:687
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossibile smistare messaggio MIME. Visualizzazione come sorgente."
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Indirizzo errato"
 
-#: mail/mail-format.c:914 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/mail-format.c:921 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1383
-msgid "No GPG/PGP program configured."
-msgstr "Programma GPG/PGP non configurato."
-
-#: mail/mail-format.c:1399
-msgid "Encrypted message not displayed"
-msgstr "Messaggi cifrati non visualizzati"
-
-#: mail/mail-format.c:1410
-msgid "Encrypted message"
-msgstr "Messaggio cifrato"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
 
-#: mail/mail-format.c:1411
-msgid "Click icon to decrypt."
-msgstr "Cliccare l'icona per decifrare."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1830
 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:1477
+#: mail/mail-format.c:1838
 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:2156
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2170
+#: mail/mail-format.c:2068
 #, 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:2175
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2204
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2212
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2217
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Riconfigurazione cartella"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9548,27 +9734,27 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile salvarele metainfo della cartella %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossibile cancellare imetadati della cartella %s: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s pu� non essere stato riconfigurato perch� non � una cartella locale"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9576,16 +9762,16 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non � possibile modificare il formato di una cartella non locale."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Riconfigura %s"
 
-#: mail/mail-mt.c:224
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9594,7 +9780,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:227
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9603,26 +9789,7 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:553
-msgid "Remember this password"
-msgstr "Ricorda questa password"
-
-#: mail/mail-mt.c:554
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:611
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Digitare la password per %s"
-
-#: mail/mail-mt.c:614
-#, fuzzy
-msgid "Enter Password"
-msgstr "Password"
-
-#: mail/mail-mt.c:1064
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Sto lavorando"
 
@@ -9634,48 +9801,43 @@ msgstr "Filtraggio Cartella"
 msgid "Fetching Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio del messaggio %d di %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:891
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Impossibile copiare una cartella su se stessa."
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Spostamento in corso"
@@ -9690,7 +9852,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Cestino"
 
@@ -9791,105 +9953,115 @@ msgstr "Disconnessione da %s"
 msgid "_Search"
 msgstr "_Cerca"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Messaggio Senza nome)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Messaggio Senza nome"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Messaggio Vuoto"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Trova nel Messaggio"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Sensibile alle Maiuscole"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Cerca avanti"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Trova:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Corrisponde:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Percorso %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Invia e Ricevi Posta"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Annulla Tutto"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: mail/mail-session.c:166
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Digitare la password per %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Password"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Messaggio Inoltrato"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9898,30 +10070,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:637
+#: mail/mail-vfolder.c:723
 #, fuzzy
 msgid "VFolders"
 msgstr "Cartelle"
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Modifica VFolder"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(nessun oggetto)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Messaggio"
@@ -9982,7 +10154,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Generazione lista messaggi"
 
@@ -10018,16 +10190,16 @@ msgstr "Sottoscrivere cartella \"%s\" "
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartella"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Nessun server � stato selezionato"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
@@ -10067,92 +10239,94 @@ msgstr "_Annulla iscrizione"
 msgid "Evolution component for the executive summary."
 msgstr "Componente di Evolution per il sommario esecutivo."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartella contente il Sommario di Evolution"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Appuntamenti"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Nessun appuntamento"
 
-#: my-evolution/e-summary-calendar.c:363
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:365
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Sommario della Posta"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Parola del Giorno"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1488
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Impostazioni Sommario"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Errore  scaricando RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Nessun obiettivo"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrizione:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Meteo"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Il server del meteo non � raggiungibile</b></dd>"
 
@@ -10160,31 +10334,23 @@ msgstr "<dd><b>Il server del meteo non � raggiungibile</b></dd>"
 msgid "Weather"
 msgstr "Meteo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regioni"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Stampa Sommario"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Stampa Sommario non riuscita"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "Il componente del sommario esecutivo non riesce ad inizializzare Bonobo.\n"
@@ -11387,7 +11553,7 @@ msgid " _Remove"
 msgstr "_Rimuovere"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11511,23 +11677,23 @@ msgstr "Mostra Dettagli"
 msgid "Cancel Operation"
 msgstr "Annulla Operazione"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Posta in Arrivo"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Posta in Uscita"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11535,15 +11701,15 @@ msgstr ""
 "Questa nuova versione di Evolution richiede l'installazione di file \n"
 "addizionali nella directory personale di Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Cliccare \"OK\" per installare i files, o \"Annulla\" per uscire."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Impossibile aggiornare i file correttamente"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11554,7 +11720,7 @@ msgstr ""
 "%s\n"
 "Errore: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11563,7 +11729,7 @@ msgstr ""
 "Si � verificato un errore durante la copia del file in\n"
 "`%s'"
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11574,7 +11740,7 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11588,7 +11754,7 @@ msgstr ""
 "avviare Evolution.\n"
 "Rimuovere questa directory?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11599,6 +11765,19 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Impossibile spostare la cartella su se stessa."
@@ -11649,7 +11828,7 @@ msgstr "Elimina \"%s\""
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Si vuole davvero rimuovere la cartella \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:456
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11658,15 +11837,21 @@ msgstr ""
 "Impossibile rinomincare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Rinomina cartella"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Il nome della cartella specificato non � valido: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11676,32 +11861,11 @@ msgstr ""
 "Impossibile creare la cartella specificata:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Nessun nome di cartella specificato."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Il nome di una cartella non pu� contenere il carattere Invio."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "La cartella non pu� contenere il separatore di directory."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "I nomi di cartelle '.' e '..' sono riservati."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Il nome della cartella specificato non � valido: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11709,19 +11873,19 @@ msgstr ""
 "Il tipo di cartella selezionata non � valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nuovo..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11735,13 +11899,13 @@ msgstr ""
 "Si pu� selezionare \"Automatico\" se non si conosce, Evolution tenter� di "
 "arrangiarsi."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Selezionare le informazioni che si desidera importare"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11752,7 +11916,7 @@ msgstr ""
 "Importatore non pronto.\n"
 "Attendere 5 secondi per riprovare."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11761,16 +11925,16 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Il file %s non esiste"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11779,11 +11943,11 @@ msgstr ""
 "Non c'� un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11792,17 +11956,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Errore nell'avvio di %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11811,31 +11975,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importa dati e impostazioni da altri programmi"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importa un file singolo"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11843,41 +12007,50 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Avvio degli Importatori Intelligenti"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Da %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Selezionare una cartella destinazione per importare questi dati"
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importa"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Chiusura connessione..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d)Impossibile avviare l'interfaccia dell'Assistente della posta di "
+"Evolution\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
-"(%s:%d)Impossibile avviare l'interfaccia dell'Assistente della posta di Evolution\n"
+"(%s:%d)Impossibile avviare l'interfaccia dell'Assistente della posta di "
+"Evolution\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11885,11 +12058,28 @@ msgstr ""
 "Inserire le informazioni\n"
 "che si desidera importare"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Nessun nome di cartella specificato."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Il nome di una cartella non pu� contenere il carattere Invio."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Questa cartella non pu� contenere messaggi."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "I nomi di cartelle '.' e '..' sono riservati."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non pu� essere eseguito."
 
@@ -11897,37 +12087,41 @@ msgstr "Bug buddy non pu� essere eseguito."
 msgid "About Ximian Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:411
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view-menu.c:412
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Selezionare la cartella che si desidera aprire"
 
-#: shell/e-shell-view-menu.c:532
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Crea un nuovo collegamento"
 
-#: shell/e-shell-view-menu.c:533
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selezionare la cartella a cui si vuole che punti il collegamento:"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:572
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'esecuzione di %s."
 
-#: shell/e-shell-view-menu.c:674
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "Non connesso"
 
-#: shell/e-shell-view-menu.c:687 shell/e-shell-view-menu.c:700
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "_Lavora Disconnesso"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Non connesso"
 
@@ -11935,49 +12129,39 @@ msgstr "Non connesso"
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1585
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: shell/e-shell-view.c:1592
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1594
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1634
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution � al momento connesso.  Cliccare questo bottone per "
 "disconnettersi."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution si sta disconnettendo."
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution � al momento disconnesso.  Cliccare questo bottone per "
 "connettersi."
 
-#: shell/e-shell.c:608
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1552
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11985,35 +12169,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1775 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1777
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:1779
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:1781
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:1783 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12022,112 +12202,112 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Rimnomina questo Gruppo di Collegamento"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Rinomina questo gruppo di collegamento come:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Rimuovi questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Rinomina questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Rinomina questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra dei Collegamenti"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Nascondi la barra dei collegamenti"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Rinomina collegamento"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Rinomina il collegamento selezionato come:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Aprire la cartella relativa a questo collegamento"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Aprire in una Nuova _Finestra"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Aprire la cartella relativa a questo collegamento in una nuova finestra"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Rinomina questo collegamento"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "Ri_muovere"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Collegamenti"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12136,133 +12316,133 @@ msgstr ""
 "Impossibile trasferire la cartella:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "la cartella specificata non � stata trovata"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Il tipo specificatp non � supportato"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "La cartella specificata non pu� essere modificata o rimossa"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Impossibile creare una cartella con quel nome"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
 
-#: shell/evolution-shell-component.c:946
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "Errore CORBA"
 
-#: shell/evolution-shell-component.c:948
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:950
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
-#: shell/evolution-shell-component.c:952
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:954
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Nessun proprietario"
 
-#: shell/evolution-shell-component.c:956
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Non trovato"
 
-#: shell/evolution-shell-component.c:958
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Tipo non supportato"
 
-#: shell/evolution-shell-component.c:960
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:962
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Opreazione non supportata"
 
-#: shell/evolution-shell-component.c:964
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: shell/evolution-shell-component.c:968
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Esiste"
 
-#: shell/evolution-shell-component.c:970
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "URI non valida"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Ha delle sottocartelle"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Spazio sul dispositivo esaurito"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12273,7 +12453,7 @@ msgstr ""
 "\n"
 "Errore sconosciuto."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12282,7 +12462,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12388,84 +12568,68 @@ msgstr ""
 "Questa guida vi accompagner� attraverso il processo \n"
 "di importazione di file esterni in Evoution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importatori"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Non importare"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Non chiedere di nuovo"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pu� importare dati dai seguenti file:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution sta ora terminando ..."
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Ciao. �Grazie per aver trovato il tempo di scaricare quest'anteprima\n"
-"della groupware suite Ximian Evolution.\n"
-"\n"
-"Ximian Evolution non � ancora completo. Ci stiamo avvicinando, ma ci sono\n"
-"ancora parti in cui manca ancora qualcosa o funziona solo a met�. \n"
-"\n"
-"Se si trovano dei bug, si prega di segnalarli a bugzilla.ximian.com.\n"
-"Questo prodotto non � accompagnato da alcuna garanzia e il suo uso\n"
-"� sconsigliato alle persone pi� irascibili.\n"
-"\n"
-"Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
-"aspettiamo ansiosamente i vostri contributi!\n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Grazie\n"
-"il Team Ximian Evolution.\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution: %s"
 
-#: shell/main.c:344
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Disabilita la schermata di avvio"
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file"
 
-#: shell/main.c:387
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Errore nel caricare il file: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Apri file"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Inserici File"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Nessun nome di cartella specificato."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12745,11 +12909,12 @@ msgstr "Stampa..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Salva"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Salva ed Esci"
 
@@ -12765,7 +12930,7 @@ msgstr "Salva l'ogetto sol disco"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_File"
@@ -12787,7 +12952,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salva"
 
@@ -12847,10 +13012,6 @@ msgstr "Pianifica una Riunione su questo argomento"
 msgid "Customise My Evolution"
 msgstr "Personalizza Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annulla"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annulla l'operazione corrente di posta"
@@ -13419,7 +13580,7 @@ msgstr "Chiudi questa finestra"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Chiudi"
@@ -13451,11 +13612,13 @@ msgstr ""
 "Cifra questo messaggio con il proprio Certificato di Crittazione S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormato"
+#, fuzzy
+msgid "For_mat"
+msgstr "Formato"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13503,7 +13666,7 @@ msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
@@ -13596,7 +13759,7 @@ msgid "_From Field"
 msgstr "Campo _Da"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -13612,7 +13775,7 @@ msgstr "Campo _Rispondi-a:"
 msgid "_Security"
 msgstr "_Sicurezza"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -13848,10 +14011,6 @@ msgstr "_Collegamento"
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "_Lavora Disconnesso"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Modifica le impostazioni del sommario"
@@ -13926,132 +14085,136 @@ msgstr ""
 "selezionare un fuso orario.\n"
 " Usare il tasto destro per rimpicciolire."
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Vista _Corrente"
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Definisci Viste"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Oggi"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La data deve essere inserita nel formato: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltico"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europeo Centrale"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Cinese"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirillico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Greco"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turco"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Europero Occidentale"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradizionale"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Semplificato"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ucraino"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nuovo"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set di caratteri sconosciuto: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Inserire il set di caratteri da usare"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Altro..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Codifica dei caratteri"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Cerca Editor"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Aggiungi alle Ricerche Salvate"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Mostra Tutto"
 
@@ -14094,14 +14257,107 @@ msgstr "Server Personale della Rubrica"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server personale del Calendario; fabbrica del calendario"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): impossibile inizializzare GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Avviso alle %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "un mittente sconosciuto"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Invita Altri"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidenziale"
+
+#~ msgid "Summarising folder"
+#~ msgstr "Creazione indice della cartella"
+
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "Impossibile aprire la cartella: %s: indice creato a partire dalla "
+#~ "posizione %ld: %s "
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Impossibile creare indice per la cartella: %s: %s"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "_Check for supported types"
+#~ msgstr "_Controlla tipi supportati"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Programma GPG/PGP non configurato."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Messaggi cifrati non visualizzati"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Messaggio cifrato"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Cliccare l'icona per decifrare."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Impossibile copiare una cartella su se stessa."
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "La cartella non pu� contenere il separatore di directory."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Ciao. �Grazie per aver trovato il tempo di scaricare quest'anteprima\n"
+#~ "della groupware suite Ximian Evolution.\n"
+#~ "\n"
+#~ "Ximian Evolution non � ancora completo. Ci stiamo avvicinando, ma ci "
+#~ "sono\n"
+#~ "ancora parti in cui manca ancora qualcosa o funziona solo a met�. \n"
+#~ "\n"
+#~ "Se si trovano dei bug, si prega di segnalarli a bugzilla.ximian.com.\n"
+#~ "Questo prodotto non � accompagnato da alcuna garanzia e il suo uso\n"
+#~ "� sconsigliato alle persone pi� irascibili.\n"
+#~ "\n"
+#~ "Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
+#~ "aspettiamo ansiosamente i vostri contributi!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Grazie\n"
+#~ "il Team Ximian Evolution.\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormato"
diff --git a/po/ja.po b/po/ja.po
index 65d752a83b..3e6b7fd152 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-23-01 00:28+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,6 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
@@ -23,291 +33,296 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
 msgid "Imports VCard files into Evolution."
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "��̾"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "̾��"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "�᡼��"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "�ץ饤�ޥ�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "�����������"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "�Ż�"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "�Ż�"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "�Ƥ��ᤷ"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "���"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "��"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "�Ż��� FAX"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "�Ż� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "�Ż� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "�� 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "����¾"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "����¾�� 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "�饸��"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "�ƥ�å���"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "�᡼��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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "�᡼��3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "�����֥�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "��̳��"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "��̳��"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "���翦"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "�ޥ͡�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "�ޥ͡�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "�˥å��͡���"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "�˥å��͡���"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "�۶���"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "������ URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "������URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "����/¿˻ URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "����/¿˻ URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "��ǰ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "��ǰ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���ƥ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "̾��: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -315,7 +330,7 @@ msgstr ""
 "\n"
 "̾��: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -323,7 +338,7 @@ msgstr ""
 "\n"
 "  �ɾ�(���Ĥ�):     "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -331,7 +346,7 @@ msgstr ""
 "\n"
 "  ��:      "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -339,7 +354,7 @@ msgstr ""
 "\n"
 "  ź��: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -347,7 +362,7 @@ msgstr ""
 "\n"
 "  ��:     "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -355,7 +370,7 @@ msgstr ""
 "\n"
 "  �ɾ�(��Ĥ�):     "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -363,7 +378,7 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -371,7 +386,7 @@ msgstr ""
 "\n"
 "����:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -379,7 +394,7 @@ msgstr ""
 "\n"
 "͹���ֹ�:  "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -387,7 +402,7 @@ msgstr ""
 "\n"
 "  ����:         "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -395,7 +410,7 @@ msgstr ""
 "\n"
 "  �̤�:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -403,7 +418,7 @@ msgstr ""
 "\n"
 "  ��:        "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -411,7 +426,7 @@ msgstr ""
 "\n"
 "  �ϰ�:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -419,7 +434,7 @@ msgstr ""
 "\n"
 "  ͹���ֹ�: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -427,7 +442,7 @@ msgstr ""
 "\n"
 "  ��:       "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -435,7 +450,7 @@ msgstr ""
 "\n"
 "��ã��٥�: "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -443,7 +458,7 @@ msgstr ""
 "\n"
 "�����ֹ�:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -451,7 +466,7 @@ msgstr ""
 "\n"
 "�����ֹ�:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -459,7 +474,7 @@ msgstr ""
 "\n"
 "�Żҥ᡼��:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -467,7 +482,7 @@ msgstr ""
 "\n"
 "�Żҥ᡼��:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -475,7 +490,7 @@ msgstr ""
 "\n"
 "�᡼��: "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -483,7 +498,7 @@ msgstr ""
 "\n"
 "�����ॾ����: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -491,7 +506,7 @@ msgstr ""
 "\n"
 "�а�: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -499,7 +514,7 @@ msgstr ""
 "\n"
 "�Ż��ο�̳: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -507,7 +522,7 @@ msgstr ""
 "\n"
 "�ȿ�: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -515,7 +530,7 @@ msgstr ""
 "\n"
 "  ��̾:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -523,7 +538,7 @@ msgstr ""
 "\n"
 "  ����:  "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -531,7 +546,7 @@ msgstr ""
 "\n"
 "  ����2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -539,7 +554,7 @@ msgstr ""
 "\n"
 "  ����3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -547,7 +562,7 @@ msgstr ""
 "\n"
 "  ����4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -555,7 +570,7 @@ msgstr ""
 "\n"
 "��̳ʬ��: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -573,7 +588,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -581,7 +596,7 @@ msgstr ""
 "\n"
 "Ǥ�դ�ʸ����: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -589,11 +604,11 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "ʣ���� VCard"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -602,82 +617,84 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "�ɤ߹�����..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "����������ɽ���ǥ��顼"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "LDAP �����Ф���³��..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "LDAP �����Ф�ǧ�ڽ���ޤ���"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "LDAP �����Фؤ���³���Ե���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "LDAP �����Фإ����ɤ��ɲ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ��ѹ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "LDAP �����η�̤������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "������Ƽ¹���"
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "����������ɤ߹��ޤ�뤳�Ȥ�����ޤ���Ǥ���\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -722,39 +739,39 @@ msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
 msgid "Factory for the sample Addressbook control"
 msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Ϣ�������Τ���ե����"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "Ϣ�������Τ���LDAP������"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "����Ϣ����ꥹ��(_L)"
 
@@ -787,7 +804,7 @@ msgid "Base"
 msgstr "�١�������ȥ�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "����"
 
@@ -870,16 +887,16 @@ msgstr "���������̾(_A):"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "�Խ�(_E)"
@@ -896,15 +913,20 @@ msgstr "�ݡ����ֹ�(_P):"
 msgid "_Server name:"
 msgstr "������̾(_S):"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "¾��Ϣ����"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +936,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
 "���̣���ޤ�"
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -926,7 +948,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -934,42 +956,42 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "̾�������Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "�ե�����֥饦����ɽ������ URI"
 
@@ -982,51 +1004,51 @@ msgstr "�ե�����֥饦����ɽ������ URI"
 msgid "(none)"
 msgstr "(�ʤ�)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "���פʥ᡼��"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "��������������"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "����Ϣ����\"%s\"��������ޤ�"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "���ɥ쥹��¸�ߤ���Ϣ����\"%s\"���ɲ�"
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "���ɥ쥹Ģ�򥯥�����..."
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Ϣ���������Խ�"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Ϣ������ɲ�"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "�Żҥ᡼�륢�ɥ쥹������"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "�������̵��"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "�������ͭ�� (�����Ǥ�!)"
 
@@ -1038,45 +1060,47 @@ msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "���"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "���٤ƺ��"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "HTML �᡼����������ޤ���?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Ϣ����ꥹ�Ȥ��Խ�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d ����ɽ��)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
+#, fuzzy
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 "Evolution �� �������륹�ȥ졼���Υ��ɥ쥹Ģ������Ǥ��ޤ��� ����Ϥ����餯 "
 "evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� ��ꡢ��"
@@ -1084,7 +1108,15 @@ msgstr ""
 "���顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ�������������������ꤤ����"
 "����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "���ɥ쥹Ģ����Ϣ���������"
 
@@ -1144,12 +1176,12 @@ msgstr "���ϼ�"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Ϣ���襨�ǥ���"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�ܺ�"
 
@@ -1218,9 +1250,9 @@ msgstr "Ϣ����(_C)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "���(_D)"
@@ -1289,37 +1321,47 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Ϣ����������ޤ���?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�ե������`%s'�Υ��������åȤ����Ĥ���ޤ���Ǥ���"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Ϣ����δʰ��ɲ�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "���٤��Խ�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "�ե�͡���"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "�᡼��"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "̸"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2388,7 +2430,7 @@ msgid "contact-list-editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
@@ -2437,149 +2479,156 @@ msgstr ""
 "�ѹ���������Ϣ�����̾�����뤤�ϥ᡼�륢�ɥ쥹��\n"
 "���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "��鸡��"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "1������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr "%d ������"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Ϣ�����ž��"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Ϣ����إ�å�����������"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "ɽ������"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "���"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "����¾�Υ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "�ѹ�����¸�������Ǥ���?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2587,75 +2636,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Ϣ������ɲä��뤿��ˤ����򥯥�å� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "�Ż�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "�Ƥ��ᤷ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "��Ҥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "�Ȥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "�Ż��ν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "�Ȥν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "�ֺ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "�Ż������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "�Ȥ����� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "����¾������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "����¾�ν���"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "���ɥ쥹Ģ����¸"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2841,96 +2899,111 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�ե����(_F)..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "�����ɤΰ���"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "�����ɤΰ���"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "���������"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "���ݥ���Ȥ��Խ�(_E)"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "�⤤"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "����"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "�㤤"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "̤���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "�����������Ф��̿���˥��顼��ȯ�����ޤ���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution ������ iTip/iMip �ӥ塼��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "�������򰷤������ Evolution ����ݡ��ͥ��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
 
@@ -2942,47 +3015,29 @@ msgstr "���顼�����Υ����ӥ�"
 msgid "Factory for the alarm notification service"
 msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
 
-#: 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:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "%s ����Ϥޤ륢�ݥ���ȤˤĤ��Ƥ�����"
-
-#: 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:165
-msgid "Notification about your appointment"
-msgstr "���ݥ���ȤˤĤ��Ƥ�����"
-
-#: 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "����"
 
-#: 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:218
+msgid "Ending:"
+msgstr ""
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "�����(_E):"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr "�������ˤĤ��Ƥ�����"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: 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 �˥��顼��"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "���顼��"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3001,11 +3056,11 @@ msgstr "���顼����߻��� (ʬ)"
 msgid "_Edit appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "�����Ϥ���ޤ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3017,7 +3072,7 @@ msgstr ""
 "���ꤹ��С�������̾�Υ�ޥ���������������ܥå���\n"
 "�ˤ�ɽ�����ޤ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3034,136 +3089,115 @@ msgstr ""
 "\n"
 "�����ˤ��Υץ�������ư���Ƥ褤�Ǥ���?"
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOME �ν����������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%Yǯ%m��%d�� %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%Yǯ%m��%d��"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%m��%d��"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "�ӥ���"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"���դϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3173,53 +3207,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "�����֤�"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "������"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "������..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "ʿ��"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "��"
 
@@ -3235,12 +3272,12 @@ msgstr "�������ޤ�"
 msgid "Comment contains"
 msgstr "�����Ȥ����Τ�Τ�ޤ�"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "�԰���"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "������"
 
@@ -3248,9 +3285,9 @@ msgstr "������"
 msgid "Folder containing appointments and events"
 msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
@@ -3259,24 +3296,24 @@ msgstr "������"
 msgid "Folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "�������ݥ���Ȥ�������ޤ�"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "������������������ޤ�"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "����������(_T)"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "��������ɽ������ URI"
 
@@ -3348,48 +3385,48 @@ msgstr "��"
 msgid "minutes"
 msgstr "ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 ��"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 ��"
 
@@ -3446,17 +3483,12 @@ msgstr "���ݥ���Ȥν�λ�� %s %s"
 msgid "%s at the end of the appointment"
 msgstr "���ݥ���Ȥν�λ�� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, c-format
-msgid "%s at an unknown time"
-msgstr "̤���� %s"
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s ��̤�Τ�ȯư������"
@@ -3477,7 +3509,7 @@ msgstr "��¥��"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -3507,7 +3539,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -3560,7 +3592,7 @@ msgid "First day of wee_k:"
 msgstr "���λϤ�(_K):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "������"
 
@@ -3573,7 +3605,7 @@ msgid "Minutes"
 msgstr "ʬ��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "������"
 
@@ -3582,7 +3614,7 @@ msgid "O_verdue tasks:"
 msgstr "���¤�᤮�������ƥ�(_O)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "������"
 
@@ -3603,7 +3635,7 @@ msgid "Su_n"
 msgstr "��(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "������"
 
@@ -3620,7 +3652,7 @@ msgid "Tas_ks due today:"
 msgstr "���������¤Υ�����(_K):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "������"
 
@@ -3641,12 +3673,12 @@ msgid "Time format:"
 msgstr "���֤ν�:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "������"
 
@@ -3715,116 +3747,121 @@ msgstr "��(_W)"
 msgid "before the start of the appointment"
 msgstr "���ݥ���Ȥγ�����"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "��ľ���Ϲ�������ޤ�������������Τ��������ޤ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�����ˤ��β�Ĥ򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�����ˤ��Υ������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�����ˤ��λ��������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "���Υ��٥�ȤϺ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "���Υ������Ϻ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "���λ��������Ϻ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s ���ѹ����ޤ������������ѹ����˴����ƥ��ǥ������Ĥ��ޤ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s ���ѹ�����Ƥޤ��󡣥��ǥ������Ĥ��ޤ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "���Υ��٥�Ȥ��ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "���Υ��������ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "���λ����������ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (���� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3832,53 +3869,53 @@ msgstr ""
 "����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
 "��񤭤��ޤ���?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�����˥��ݥ���� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�����˥����ȥ�ʤ��Υ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�����˥����� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�����˥����ȥ�ʤ��Υ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�����˻������� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�����˥����ȥ�ʤ��λ��������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "������ %d �ĤΥ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ %d �Ĥλ��������������Ƥ��������Ǥ���?"
@@ -3895,25 +3932,25 @@ msgstr "��Ǥ��:"
 msgid "Enter Delegate"
 msgstr "��Ǥ�������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "���ݥ����"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "��¥��"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "�����֤�"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "�������塼��"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "���"
 
@@ -3932,11 +3969,12 @@ msgid "Classification"
 msgstr "ʬ��"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "��̩(_F)"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "���դȻ���"
 
@@ -3945,12 +3983,12 @@ msgid "F_ree"
 msgstr "�ե꡼(_R)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "��Ū(_V)"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "��Ū(_B)"
 
@@ -3960,7 +3998,7 @@ msgid "Show Time As"
 msgstr "���֤���ꤷ��ɽ��"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "���ޥ�(_M):"
 
@@ -3972,32 +4010,20 @@ msgstr "�����(_E):"
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr "��Ĺ"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr "ɬ�׻��ü�"
+#: calendar/gui/dialogs/meeting-page.c:422
+#, fuzzy
+msgid "An organizer is required."
+msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr "Ǥ�ջ��ü�"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
-msgstr "�Ի��ü�"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "��Ǥ��(_D)..."
 
@@ -4037,6 +4063,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4055,7 +4082,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "����"
@@ -4070,7 +4097,8 @@ msgid "_Change Organizer"
 msgstr "��żԤ��ѹ�(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "¾�ξ���(_I)..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4081,23 +4109,23 @@ msgstr "¾�μ�ż�(_O)"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "���Υ��ݥ���Ȥ� Evolution ���Խ�����ʤ������֤��롼���ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "�����"
 
@@ -4161,19 +4189,15 @@ msgstr "��"
 msgid "year(s)"
 msgstr "ǯ"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�ѹ�����¸�������Ǥ���?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4192,7 +4216,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4204,138 +4228,169 @@ msgstr "ͥ����(_P):"
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "����:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "������(_R):"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "��̩(_C)"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "����(_D):"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "���򤷤�Ϣ����������ޤ�"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "������������(_D)"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"���դϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "���顼��"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
@@ -4366,8 +4421,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "���ޥ�"
 
@@ -4379,313 +4434,395 @@ msgstr "�������򥽡���"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "�������ذ�ư(_G)..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "���Υ��ݥ���Ȥ���(_D)"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "���ν�������ư�ˤ���(_M)"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "����������(_O)"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "����/¿˻ ���󳫻�: <b>"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "����: <b>"
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "��Ľ�λ����(_E):"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����/¿˻ ���󳫻�: <b>"
+
+#: calendar/gui/e-itip-control.c:557
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��� "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "����������(_C):"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "������������"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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 "<b>���ޥ�:</b> %s<br><br>"
-
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
-msgstr "<b>����:</b> %s"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "��������������"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "�������򹹿�"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "���ष��"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "����󥻥�"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "��ľ���"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "��Ĥ����"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "��Ĥι����׵�"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "��Ĥ˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "��Ĥ򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "�����ʲ�ĥ�å�����"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "�������ι����׵�"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "�������˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "�������򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "�����ʥ�������å�����"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "����/¿˻ ���ֿ�"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "������ ����/¿˻ ��å�����"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "���Υ�å������������������ǤϤ���ޤ���"
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "��Ϥ��ʤ��Υ������ե����뤫�餽�Υ����ƥ�����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4726,193 +4863,215 @@ msgstr "���"
 msgid "date-start"
 msgstr "������"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "��Ĺ"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "ɬ�׻��ü�"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Ǥ�ջ��ü�"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "�Ի��ü�"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "�Ŀ�"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "���롼��"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "�꥽����"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "̤��"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "��Ĺ"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "���üԤ�ɬ��"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Ǥ�ջ��ü�"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "�Ի��ü�"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "ư�ɬ��"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "���ष��"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "��Ǥ����"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "���ե����γ�"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "����ʤ�"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "¾�ξ���(_I)..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "���ץ����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "�Ż���λ��֤���ɽ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "�̾�����ɽ��(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "�ե꡼/�ӥ��� �ι���(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "<<(_<)"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "��ư�ԥå����å�(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">>(_>)"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "���٤Ƥο͡��ȥ꥽����(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "�͡���ɬ��(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "��ij��ϻ���(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "��¸���줿 %s �򥪡��ץ���"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "�ե���� %s �򥪡��ץ���"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 ��"
@@ -4969,226 +5128,274 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20 ��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21 ��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22 ��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23 ��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24 ��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25 ��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26 ��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27 ��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28 ��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29 ��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30 ��"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31 ��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "���򤷤����� [%Y/%m/%d (%a)]"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "���򤷤��� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "���򤷤��� (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "���򤷤�ǯ (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "������(_T)"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "���ơ�����(_S):"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "ͥ����(_P):"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"��̳ʬ��: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ϣ����(_N):"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "���������"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "�����ƥ�����"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "�ץ�󥿤�����"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "�������ե������ɽ������ URI"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5196,7 +5403,7 @@ msgstr ""
 "Evolution �ϥ������ե�����Υ������������, ��ưŪ�˿������������ե������"
 "��ư���ޤ�"
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5208,7 +5415,7 @@ msgstr ""
 "������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, �Ǥ��ΤǤ��Υץ���"
 "���Ϥ��θ�Ƥӻ���Ǥ��礦"
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5217,7 +5424,7 @@ msgstr ""
 "`%s' �򳫤����Ȥ�����ޤ���Ǥ���; �������ե�������饿�����ե�����ذ�ư��"
 "�륢���ƥब����ޤ���"
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5226,111 +5433,111 @@ msgstr ""
 "`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե������"
 "�饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5354,7 +5561,7 @@ msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 msgid "Decryption is not supported by this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5362,7 +5569,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5370,89 +5577,89 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "̤�б������: uid �Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "��å��������ư"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5461,7 +5668,7 @@ msgstr ""
 "����ɽ���ι�ʸ����Ͻ���ޤ���: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5470,7 +5677,7 @@ msgstr ""
 "����ɽ���Ǥθ�����¹���˥��顼: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5479,195 +5686,195 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "���å��󥰥إ�ѡ��ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "���å��󥰥إ�ѡ���ʬ�����뤳�Ȥ�����ޤ���: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' ����å�����ޤ���Ǥ���"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "%s �Υ��å��ե�����������˥����ॢ���Ȥ��ޤ���. ��Ǥ��ľ���Ƥ�������"
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "�᡼��ե����� %s ������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "�᡼��ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork ����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail �ץ������ϼ��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(̤�ΤΥ��顼)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "���Υ�å������˽�̾����ޤ���: ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "���Υ�å������˽�̾����ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %"
 "s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: ���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ�"
 "�ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ������ɽ���ޤ���Ǥ���: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
@@ -5687,7 +5894,7 @@ msgid "Connection cancelled"
 msgstr "��³�ϥ���󥻥뤷�ޤ���"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
@@ -5697,12 +5904,12 @@ msgid "(unknown host)"
 msgstr "(̤�ΤΥۥ���)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
@@ -5812,7 +6019,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -5829,8 +6036,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "�ѥ����"
 
@@ -5859,55 +6066,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "����ɽ�����Խ��˼���: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "�����: %s"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "���ۥե�����᡼��ץ��Х���"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5953,15 +6160,15 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 msgid "Failed to verify certificates."
 msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5971,7 +6178,7 @@ msgstr ""
 "�о�: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5986,7 +6193,7 @@ msgstr ""
 "\n"
 "������˾�ߤޤ���?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6005,37 +6212,37 @@ msgstr ""
 "��: %s\n"
 "��: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
@@ -6068,57 +6275,57 @@ msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "�ե�������˲�����ƺ�������ޤ���"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "�ѹ����줿��å�������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "������������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "����᡼��Υ����å�"
 
@@ -6126,7 +6333,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "�ե����"
 
@@ -6159,28 +6366,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6191,88 +6398,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH�饤���ʥ᡼��ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "���������ۿ�"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "ɸ�� mbox �����ǥ�������᡼������"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "INBOX ��ˤ��뿷����å������إե��륿��Ŭ�Ѥ���"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir �����Υ᡼��ե�����"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+#, fuzzy
+msgid "For storing local mail in maildir directories."
 msgstr "qmail maildir �ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������᡼��ե����� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�ե�������饵�ޥ꡼�ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6284,23 +6495,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "���ޥ꡼�򥻡��ֽ���ޤ���Ǥ���: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6309,20 +6525,20 @@ msgstr ""
 "��å��������������ޤ���: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "��å����������Ƥ�̵���Ǥ�"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6331,15 +6547,15 @@ msgstr ""
 "�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6348,19 +6564,19 @@ msgstr ""
 "�ե���� `%s' ���������ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
@@ -6375,29 +6591,34 @@ msgstr "�ե���� `%s' ����������ޤ���Ǥ���: %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "���ϥ���󥻥뤷�ޤ���"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6406,17 +6627,17 @@ msgstr ""
 "��å����� %s ��ե���� %s �����������ޤ���\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6425,7 +6646,7 @@ msgstr ""
 "�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6434,14 +6655,14 @@ msgstr ""
 "�ե����� `%s' ��������뤳�Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6450,103 +6671,111 @@ msgstr ""
 "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "�ե��������¸��"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�ե����������å�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "̤�ΤΥ��顼: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Ϣ����ˤإ�å�����������"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
@@ -6556,203 +6785,187 @@ msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "���ס���᡼��ե����� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "���ס���ե�����Ϻ���Ǥ��ޤ���"
 
-#. 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 "�ե�����Υ��ޥ�������"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ƥ�ݥ��ե������Ʊ������ޤ���Ǥ��� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "���ס���ե������Ʊ������ޤ���Ǥ��� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "�ե��������ޤ���Ǥ���: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "��å����� %s �ϸ��դ���ޤ���"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "�����Ф��饰�롼�ץꥹ�Ȥ��������ޤ���Ǥ���"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ��ͳ�� USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� NNTP �����Ф�ǧ�ڤ��ޤ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "POP ���ޥ�������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP �����Фǿ�����å�����������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "������줿��å�������õ�ޤ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "��å��������������ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s �Υ�å������Ϥ���ޤ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ������ %d �������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "��å��������ȥ졼��"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "�����Ф˥�å�������Ĥ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP �����Ф���³���ƥ᡼������������ɤ��뤿��Τ�ΤǤ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6760,7 +6973,7 @@ msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȤΥѥ���ɤ�Ȥä� POP �����Ф���³���ޤ�. "
 "�����¿���� POP �����Фǥ��ݡ��Ȥ���륪�ץ����Ǥ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6770,32 +6983,32 @@ msgstr ""
 "�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
 "��ư���櫓�ǤϤ���ޤ���."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "����� POP �����Ф���³��, Kerberos 4 ǧ�ڤ�Ȥ��ޤ�."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "�����Ф���³���뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6804,12 +7017,12 @@ msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�桼��̾��������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(̤��)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6817,7 +7030,7 @@ msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6826,195 +7039,195 @@ msgstr ""
 "POP �����Ф���³�Ǥ��ޤ���\n"
 "�ѥ���ɤ�������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, 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:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "�᡼����������뤿��˥������륷���ƥ�� \"sendmail\" �ץ��������Ϥ��ޤ�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "��å���������������ޤ���Ǥ���: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail �ϥ����ʥ� %s �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ��¹Խ���ޤ���Ǥ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail �ϥ��ơ����� %d �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "��ʸ���ϥ��顼, ���ޥ�ɤǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "�ѥ�᡼�����뤤�ϰ����˹�ʸ���ϥ��顼"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "���ޥ�ɤϼ�������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "���ޥ�ɥѥ�᡼���ϼ�������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "�����ƥॹ�ơ��������뤤�ϥ����ƥ�إ�ױ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "�إ�ץ�å�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "�����ӥ������ѤǤ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "�����ӥ������������ͥ���Ĥ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "�����ӥ������ѤǤ��ޤ���, ���������ͥ���Ĥ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ��ž�����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "�׵ᤵ�줿�᡼���ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "�׵ᤵ�줿ư������Ǥ��ޤ���: ������˥��顼"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ���Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �����ƥ����¸�ΰ褬­��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "�׵ᤵ�줿�᡼���ư������Ǥ��ޤ���: �ΰ������Ƥ�ۤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå���̾��ǧ����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "�᡼������Ϥ򳫻Ϥ��ޤ�; <CRLF>.<CRLF> �ǽ�λ���ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "�����ϼ��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "�ѥ���ɤ��ѹ���ɬ�פǤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "ǧ�ڥᥫ�˥�����Խ�ʬ�᤮�ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "�׵ᤷ��ǧ�ڥᥫ�˥���Τ���˰Ź沽��ɬ�פǤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7025,169 +7238,169 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP ǧ��"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH �׵�˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "ź��"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "ź�դ��ɲ�..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
@@ -7219,52 +7432,52 @@ msgstr "MIME ������:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "���п�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7277,7 +7490,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "�ե������ź�դ��ޤ�"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7286,29 +7499,29 @@ msgstr ""
 "�ե�������ɤ߹�����˥��顼: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "�ٹ�!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7316,16 +7529,16 @@ msgstr ""
 "���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
 "�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�ե�����Υ���������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7334,7 +7547,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7343,7 +7556,7 @@ msgstr ""
 "�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7352,7 +7565,7 @@ msgstr ""
 "��å������μ�ư��¸��˥��顼: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7360,7 +7573,7 @@ msgstr ""
 "Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
 "������ꥫ�Хꤷ�Ƥߤޤ���?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7370,27 +7583,38 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�ե����������"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
+"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7398,11 +7622,11 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �᡼������ν����������ޤ���"
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7450,15 +7674,24 @@ msgstr "��̾�����Τ�Τ�ޤ�"
 msgid "Subject does not contain"
 msgstr "��̾�����Τ�Τ�ޤޤʤ�"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
 
@@ -7509,30 +7742,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%p %I"
 
@@ -7668,7 +7901,7 @@ msgstr "����"
 msgid "Add action"
 msgstr "ư����ɲ�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7676,16 +7909,16 @@ msgstr ""
 "�ե�����������˺��Ƥ��ޤ�\n"
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "�ե����������"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "�ե���� URI ������"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
@@ -7702,39 +7935,39 @@ msgstr ""
 msgid "Test"
 msgstr "�ƥ���"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "�롼��̾: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "�����ȥ�ʤ�"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "�⤷"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "���ξ���ư���¹�:"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "���٤Ƥδ�ब��ä���"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "�����Ĥ��δ�ब��ä���"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "�����ɲ�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "����"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "����"
 
@@ -7927,7 +8160,7 @@ msgstr "�ֿ���"
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "������"
 
@@ -7959,7 +8192,7 @@ msgstr "�����Τ�Τdz��Ϥ���"
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "��̾"
@@ -7972,15 +8205,15 @@ msgstr "���������"
 msgid "was before"
 msgstr "����������"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "�롼��"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "�롼����ɲ�"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "�롼����Խ�"
 
@@ -7988,42 +8221,42 @@ msgstr "�롼����Խ�"
 msgid "Score Rules"
 msgstr "�������롼��"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution �� ���ʤ��θŤ� Elm �᡼��򥤥�ݡ�����"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "����ݡ�����..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "���Ф餯���Ԥ���������"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "%s ��������"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "�᡼��"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8031,19 +8264,15 @@ msgstr ""
 "Evolution �� Elm �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GNOME ������: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "���ɥ쥹Ģ"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8051,23 +8280,23 @@ msgstr ""
 "Evolution �� GnomeCard �ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "�ǥ��쥯�ȥ��������"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "����ݡ��ȳ���"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "����"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8075,11 +8304,11 @@ msgstr ""
 "Evolution �� Netscape �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8087,7 +8316,7 @@ msgstr ""
 "Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8123,240 +8352,245 @@ msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
 msgid "Mail configuration interface"
 msgstr "�᡼������Υ��󥿡��ե�����"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "�᡼���ޤ�ե����"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "���ۤ���Ȣ"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "���ۤ���Ȣ�ե����"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "�ץ��ѥƥ�..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "�����᡼���å�����"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "�����᡼���å�����(_M)"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �Υץ��ѥƥ�"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "����%d��"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ","
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d ̤����"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d ������"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "���%d��"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "�������鲾�ۥե��������"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�ǥե����(_F)"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "�ե��������μ���"
@@ -8378,18 +8612,27 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Evolution �� Outlook Express 4 �ե�����򥤥�ݡ���"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "��ʸ�����Τ�Τ�ޤ�"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "���ߤ���¸����:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "�᡼��ܥå����η���"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "������¸����:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8399,15 +8642,15 @@ msgstr ""
 "�������ʤ����⤷��ޤ��� (�㤨�Хǥ��������ڡ�����­��ʤ�)\n"
 "���դ��Ƥ��ε�ǽ��ȤäƤ�������"
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8425,15 +8668,15 @@ msgstr "Evolution �˥塼�����ǥ���"
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr "��̾�ե��������¸����ޤ���Ǥ���"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "��̾����¸"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8443,7 +8686,7 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
@@ -8459,52 +8702,52 @@ msgstr "̵��"
 msgid "Enable"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "������ʤ�"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "�����˥�������Ȥ������ޤ���?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "�᡼������"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "%s �إ᡼��"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "��̾�� %s �Ǥ�"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ����᡼��"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �᡼��󥰥ꥹ��"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8516,7 +8759,7 @@ msgstr ""
 "ɬ�פ�����ޤ�\n"
 "�����ꤷ�ޤ���?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8524,7 +8767,7 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥桼�������\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8532,22 +8775,22 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥᡼��\n"
 "����������򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "�Ȥˤ�����������?"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8555,57 +8798,57 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "���Υ�å���������Ŭ�ڤʼ����Ԥ�ޤ�Ǥ��ޤ�:"
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8613,7 +8856,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8621,28 +8864,28 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8654,11 +8897,11 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8667,19 +8910,19 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
@@ -8733,16 +8976,16 @@ msgstr ""
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, c-format
 msgid "Account %d"
 msgstr "��������� %d"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8753,16 +8996,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: ����Ȣ"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
@@ -8779,31 +9022,33 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
 #: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "��������ȴ���"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+#, fuzzy
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -8815,26 +9060,23 @@ msgid "Authentication"
 msgstr "ǧ��"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "ǧ�ڼ���: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "����᡼��Υ����å�"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "ǧ�� ID"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "�᡼�����"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr "�ե�����Ǥκ����ǧ"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8850,229 +9092,235 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "�ǥե���Ȥ�ž����ˡ: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "ɽ��"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "���"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "��ƥե����:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "ͭ��(_E)"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "�Խ�..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "ͭ��"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML ��̾�ե�����:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "����饤��"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "�˥塼��"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "���ץ����"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "�������ץ����"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "�����奢 MIME"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "�������ƥ�"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "�ե��륿�������ե����������..."
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "�����ѥ�å������ե����:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "�����ѥ�å������ե����:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "��̾�ե�����:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "������"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "������"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "���̤ʥե����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9082,103 +9330,129 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���"
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "ǧ�ڼ���: "
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "��ƥե����:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "�᡼�륢�ɥ쥹(_E):"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_E)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "���Ѥ�Ĵ����(_H)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "���(_O):"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "_PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "���Υѥ���ɤ򵭲�(_R)"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "�������:"
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "��̾�ե�����(_S):"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "�桼��̾(_U):"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "��"
+
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "����"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr " ��"
 
@@ -9218,151 +9492,145 @@ msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "ź�դ���¸"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "�ǥ���������¸..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "����饤��ɽ��"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "%s �˳���..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "����饤��ɽ�� (%s��ͳ)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "�����ӥ塼��"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "��������¸..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "GPG/PGP �ץ����������꤬����ޤ���"
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "�Ź沽���줿��å�����"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "��������򥯥�å��������沽���Ƥ�������"
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "�ե������ƹ�����"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9371,27 +9639,27 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s: %s"
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9399,16 +9667,16 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �����"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9417,7 +9685,7 @@ msgstr ""
 "'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9426,25 +9694,7 @@ msgstr ""
 "���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "���Υѥ���ɤ򵭲�"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
-
-#: mail/mail-mt.c:567
-msgid "Enter Password"
-msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "�����"
 
@@ -9452,118 +9702,113 @@ msgstr "�����"
 msgid "Filtering Folder"
 msgstr "�ե������ե��륿��"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "�᡼��������"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ��������"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "������ %d / %d ��������"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "��λ���ޤ���"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:877
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "�ե���� `%s' ��Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "��ư��"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "���ԡ���"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "����Ȣ"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ե���� '%s' ����¸��"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d �̤Υ�å���������¸��"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9572,7 +9817,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9581,11 +9826,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9594,17 +9839,17 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
@@ -9613,95 +9858,104 @@ msgstr "%s �˺���³��"
 msgid "_Search"
 msgstr "����(_S)"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(̵��Υ�å�����)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "̵��Υ�å�����"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "���Υ�å�����"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "��å������򸡺�"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "��ʸ��/��ʸ������̤���"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "��������"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "����:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "����󥻥���..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������: %s, ����: %s"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "����: %s"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "���٤ƥ���󥻥�"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��å�������ž�����ޤ��� - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���ۥե�����������: %s"
@@ -9711,7 +9965,7 @@ msgstr "���ۥե�����������: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "URI �β��ۥե�����򹹿���: %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9720,28 +9974,28 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "���ۥե����"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "���ۥե�������Խ�"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(��̾�ʤ�)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
@@ -9802,7 +10056,7 @@ msgstr "%p %l:%M (%a)"
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -9828,26 +10082,26 @@ msgstr "\"%s\" �� %s �ʲ��Υե������������"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" �Υ롼�ȥ�٥�ե������������"
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �������"
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �ι��ɲ����"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "�ե����"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "���򤵤줿�����ФϤ���ޤ���"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "����������"
 
@@ -9887,128 +10141,126 @@ msgstr "���ɲ��(_U)"
 msgid "Evolution component for the executive summary."
 msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution���ޥ꡼��ޤ�ե����"
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "���ݥ����"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "���ݥ���ȤϤ���ޤ���"
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+#, fuzzy
+msgid "%k:%M %d %B"
 msgstr "%k%M %B%d��"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%B%d��%l��%Mʬ"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "�᡼�륵�ޥ�"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "RJTT:RJAA:RJTA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ����������"
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "������"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "̾��:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "���ޥ������"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "RDF �Υ������������˥��顼"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "�������Ϥ���ޤ���"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(�����ʤ�)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>��ŷ�������С�����³�Ǥ��ޤ���Ǥ���</b></dd>"
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "��ŷ��"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr "RJTT:RJAA:RJTA"
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "�ϰ�"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%Yǯ%B%e�� %A"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "���ޥ�����"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 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 "�ݻ�"
 
@@ -10056,7 +10308,7 @@ msgstr "����ޤ�"
 msgid "Overcast"
 msgstr "�ޤ�"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "����"
 
@@ -10128,1061 +10380,1072 @@ msgstr "����"
 msgid "North - Northwest"
 msgstr "�� - ����"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "���٤�̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "�夤̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "�¤�̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "����̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "����ä�̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "�꡹̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "����̸��"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "��̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "�᤭�Ĥ���̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "�ˤ狼��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "�᤭�󤻤�̸��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "��ɹ����̸��"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "��"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "���٤DZ�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "�夤��"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "�¤α�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "������"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "����äȱ�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "�꡹��"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "������"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "�᤭�Ĥ��뱫"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "�ˤ狼�˱�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "�᤭�󤻤뱫"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "��ɹ���α�"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "��"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "���٤���"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "�夤��"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "�¤���"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "������"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "������"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "�꡹��"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "������"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "�����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "�ˤ狼��"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "�᤭�󤻤���"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "��ɹ������"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "�����"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "���٤�γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "�夤γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "�¤�γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "�����"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "�����"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "�꡹γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "�����"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "�᤭�Ĥ���γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "�ˤ狼γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "�᤭�󤻤�γ��"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "��ɹ����γ��"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "��ɹ"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "�����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "���٤Ǥ����"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "�夤�����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "�¤Τ����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "���������"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "���������"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "�꡹�����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "���������"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "�᤭�Ĥ��뤢���"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "�ˤ狼�����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "�᤭�󤻤뤢���"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "��ɹ���Τ����"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "���٤��"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "�¤��"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "�����"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "�����"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "�꡹�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "�����"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "���"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "�᤭�Ĥ����"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "�ˤ狼�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "�᤭�󤻤��"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "��ɹ�����"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "�����ʹ߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "���٤ǹ߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "�夤�߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "�¤ι߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "�����߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "�����߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "�꡹�߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "�����߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "̤�Τ�����"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "�᤭�Ĥ���߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "�����ʤˤ狼�߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "�᤭�󤻤�߿�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "��ɹ���ι߿�"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "���٤�̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "�夤̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "�¤�̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "ǻ��̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "����̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "�꡹̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "����̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "����̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "�᤭�󤻤�̸"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "��ɹ����̸"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "��̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "���٤DZ�̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "�夤��̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "�¤α�̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "ǻ����̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "������̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "�꡹��̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "������̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "���ȱ�̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "�᤭�󤻤��̸"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "��ɹ���α�̸"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "��"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "���٤DZ�"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "�٤���"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "�¤α�"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "ǻ����"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "������"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "�꡹��"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "������"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "��ȱ�"
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "�뤬���륹������"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "���ȱ�"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "�᤭�󤻤��"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "���٤Dzл���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "�¤βл���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "ǻ���л���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "�������"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "�꡹�л���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "�������"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr "��Ȳл���"
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "ǻ���л���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "�᤭�Ĥ���л���"
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
 msgstr "�ˤ狼�˲л���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "�᤭�󤻤�л���"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "��ɹ���βл���"
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "��"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "���٤Ǻ�"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "�夤��"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "�¤κ�"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "������"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "�꡹��"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "������"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "�᤭�Ĥ��뺽"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "�᤭�󤻤뺽"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "���"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "���٤Ǥ��"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "�夤���"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "�¤Τ��"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "ǻ�����"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "�������"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "�꡹���"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "�������"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "��������"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "�᤭�󤻤���"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "��ɹ���Τ��"
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
 msgstr "���"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
 msgstr "���٤ǿ��"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
 msgstr "�夤���"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
 msgstr "�¤ο��"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+#, fuzzy
+msgid "Patches of spray"
 msgstr "�꡹���"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
 msgstr "�᤭�Ĥ�����"
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
 msgstr "�᤭�󤻤���"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
 msgstr "��ɹ���ο��"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "���٤�ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "�夤ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "�¤�ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "����ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "�꡹ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "����ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "�᤭�Ĥ���ʴ��"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "�᤭�󤻤�ʴ��"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "��������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "���٤ǥ�������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "�夤��������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "�¤Υ�������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "������������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "������������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "�뤬���륹������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "�᤭�Ĥ��륹������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "�᤭�󤻤륹������"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "��ɹ���Υ�������"
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "����"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "���٤Ǻ���"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "�夤����"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "�¤κ���"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "��Τ��뺽��"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "�᤭�Ĥ��뺽��"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "�᤭�󤻤뺽��"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "��ɹ���κ���"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "����"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "���٤ǿ���"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "�夤����"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "�¤ο���"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "��������"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "�뤬�������"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "�᤭�Ĥ������"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "�᤭�󤻤����"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "��ɹ���ο���"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11191,7 +11454,8 @@ msgid " _Remove"
 msgstr "��� (_R)"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+#, fuzzy
+msgid "Add n_ews feed"
 msgstr "�����˥塼���ۿ����ɲ�(_E)"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11206,13 +11470,13 @@ msgstr "���٤ƤΥե����(_F):"
 msgid "All news _feeds:"
 msgstr "���٤ƤΥ˥塼���ۿ�(_F)"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
-msgstr "�᡼�ȥ�ˡ(_E)"
+msgid "How many days should the calendar display at once?"
+msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
@@ -11251,12 +11515,12 @@ msgid "Show _today's tasks"
 msgstr "�����Υ�������ɽ��(_T)"
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "������ "
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr "ñ��: "
+msgid "Tasks "
+msgstr "������ "
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
@@ -11275,12 +11539,12 @@ msgid "_Displayed feeds:"
 msgstr "ɽ���Ѥߤ��ۿ�(_D)"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
-msgstr "5����(_F)"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr "����ڥꥢ��ˡ(_I)"
+msgid "_Five days"
+msgstr "5����(_F)"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -11314,23 +11578,23 @@ msgstr "�ܺ٤�ɽ��"
 msgid "Cancel Operation"
 msgstr "���򥭥�󥻥�"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "����Ȣ"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "����Ȣ"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "��������ե����"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution �Υ��󥹥ȡ���"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11338,15 +11602,15 @@ msgstr ""
 "���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
 "�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11357,7 +11621,7 @@ msgstr ""
 "\n"
 "���顼: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11366,7 +11630,7 @@ msgstr ""
 "�ե������ `%s' �إ��ԡ����\n"
 "���顼��ȯ�����ޤ���"
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11377,7 +11641,7 @@ msgstr ""
 "Evolution �桼���ե�����Υ��󥹥ȡ����\n"
 "���Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11391,7 +11655,7 @@ msgstr ""
 "�������ɬ�פ�����ޤ�\n"
 "���Υǥ��쥯�ȥ�������ޤ���?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11402,6 +11666,19 @@ msgstr ""
 "�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
 "�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "�ե������Ʊ���ե�����ˤϰ�ư�Ǥ��ޤ���"
@@ -11414,25 +11691,25 @@ msgstr "�ե������Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "�ե���� \"%s\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "�ե�����Υ��ԡ�"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "�ե���� \"%s\" ���ư����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "�ե�����ΰ�ư"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11441,18 +11718,18 @@ msgstr ""
 "�ե���������Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" ����"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "������ �ե���� \"%s\" �������Ƥ��������Ǥ���?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11461,15 +11738,21 @@ msgstr ""
 "�ե�������͡���Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�ե���� \"%s\" ���͡���"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "�ե�������͡���"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11479,32 +11762,11 @@ msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "�ե����̾�ˤϥǥ��쥯�ȥ���ڤ�ʸ���ϻȤ��ޤ���"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �����ե�����κ���"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11512,19 +11774,19 @@ msgstr ""
 "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 "ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "����..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11538,13 +11800,13 @@ msgstr ""
 "�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
 "���礦"
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11555,7 +11817,7 @@ msgstr ""
 "����ݡ����ν���������Ƥ��ޤ���\n"
 "5���Ԥäƺ��ٻ�Ƥ�������"
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11564,16 +11826,16 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� %d �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11582,11 +11844,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11595,17 +11857,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11614,136 +11876,144 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "%s ����:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "����ݡ���"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "��³���Ĥ��Ƥ��ޤ�..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 
-#: shell/e-shell-startup-wizard.c:168
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: shell/e-shell-view-menu.c:235
-msgid "Ximian Evolution"
-msgstr "Ximian 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:239
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution �� GNOME �ǥ����ȥå�\n"
-"�Ķ��ǤΥ᡼�롤��������������\n"
-"Ϣ����ޥ͡������ȤΤ����\n"
-"���롼�ץ��������ץꥱ�������Ǥ�"
+#: shell/e-shell-view-menu.c:215
+#, fuzzy
+msgid "About Ximian Evolution"
+msgstr "Ximian Evolution �ˤĤ���..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "�������硼�ȥ��åȤ�������ޤ�"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ��¹���˥��顼"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "���ե饤����(_W)"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "���ե饤����"
 
@@ -11751,49 +12021,39 @@ msgstr "���ե饤����"
 msgid "(No folder displayed)"
 msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(�ʤ�)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution - %s"
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11801,35 +12061,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "���롼��̾:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11838,111 +12094,111 @@ msgstr ""
 "�����˥��硼�ȥ��åȥС����饰�롼��\n"
 "`%s' �����������Ǥ���?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "������ޤ���"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "���硼�ȥ��åȥ��롼�פ��͡���"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "���򤵤줿���硼�ȥ��åȥ��롼�פ��͡���:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "��������������(_S)"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "�礭����������(_L)"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "�������롼��(_N)..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "���Υ��롼�פ���(_R)..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "���Υ��롼�פ��͡���(_N)..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ��͡��ष�ޤ�"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "���硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "���򤵤줿���硼�ȥ��åȤ��͡���:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򳫤�"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "����������ɥ��dz���(_W)"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򿷤���������ɥ��dz���"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "��͡���(_R)"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "���(_M)"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11951,64 +12207,170 @@ msgstr ""
 "�ե����ž���Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(̾���ʤ�)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ��λ)"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "I/O ���顼"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "�����ʰ����Ǥ�"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "����"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "�����ɤ����Ĥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "����¾�Υ��顼"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "��¸�ߤ���"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "����"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "���򤵤줿��å������Ϥ���ޤ���"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "�����ʥ��顼"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "�����ƥ��֤���³"
@@ -12107,81 +12469,68 @@ msgstr ""
 "���Υ���������ȤǤ� Evolution ����˳����ե�����򥤥�ݡ���\n"
 "����������̤��ư��⤷�ޤ�"
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "����ݡ���"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "����ݡ��Ȥ��ޤ���"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
-"����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
-"\n"
-"Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
-"�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
-"\n"
-"�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
-"���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
-"\n"
-"�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
-"Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr "Ximian Evolution��������\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "���ץ�å�����̤�̵���ˤ���"
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "�ե�����Υ�������˥��顼: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "�ե�����򳫤�"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "�ե����������"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12271,7 +12620,7 @@ msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "ư��(_A)"
@@ -12293,7 +12642,7 @@ msgid "_Forward Contact..."
 msgstr "Ϣ�����ž��(_F)..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "����(_P)..."
@@ -12338,7 +12687,7 @@ msgstr "��"
 msgid "Delete the appointment"
 msgstr "���Υ��ݥ���Ȥ���"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "��ư"
 
@@ -12461,11 +12810,12 @@ msgstr "����..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "��¸"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "��¸�����Ĥ���"
 
@@ -12481,7 +12831,7 @@ msgstr "�ǥ������ˤ��ι��ܤ���¸���ޤ�"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "�ե�����(_F)"
@@ -12503,7 +12853,7 @@ msgstr "Ϣ�������¸���Ƥ��Υ����������ܥå������Ĥ��ޤ�"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "��¸(_S)"
 
@@ -12563,10 +12913,6 @@ msgstr "���Υ����ƥ�ؤΥߡ��ƥ��󥰤򥹥����塼��"
 msgid "Customise My Evolution"
 msgstr "My Evolution �Υ������ޥ���"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "����󥻥�"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
@@ -12820,279 +13166,309 @@ msgstr "���������ԤΤ���β��ۥե������������ޤ�"
 msgid "Create a virtual folder for this subject"
 msgstr "���η�̾�Τ���β��ۥե������������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "����̤�ɥ���åɤ�ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_L)..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "�����ԤΥե��륿(_N)..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "�����ԤΥե��륿(_R)..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "��̾�Υե��륿(_S)..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "����Ū�� HTML �᡼��β������ɤ߹���"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "ž��"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "ž��"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "ź�դ���ž��(_A)"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "����饤���ž��(_I)"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "���Ѥ���ž��(_Q)"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "������å���������ʸ��������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "���Ѥ������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ź�դȤ���ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "�ƥ����ȥե����������..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "���פ˥ޡ���(_M)"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "���פǤʤ��˥ޡ���(_O)"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "�����ѤߤȤ������򤵤줿��å�������ޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "���򤵤줿��å���������פ˥ޡ���"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "̤�ɤȤ������򤵤줿��å�������ޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "���򤵤줿��å������ν��פǤʤ��˥ޡ���"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "��ư"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "�̤Υե���������򤵤줿��å��������ư���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "���ν��פʥ�å�����"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "���Υ�å�����"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "���Υ���å�"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "����̤�ɥ�å�����"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "����������ɥ������򤵤줿��å������򳫤��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "���򤵤줿��å������򥳥�ݡ����dz����������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "���������å������Υץ�ӥ塼"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "���ν��פʥ�å�����"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "���Υ�å�����"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "����̤�ɥ�å�����"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "���Υ�å����������"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "�ֿ�"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "�������ֿ�"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr "��å������θ���(_E)"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "�᡼��Υ�������ɽ��(_S)"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "���٤ƤΥإå���ɽ��(_H)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "�̾�Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "��å������Υ�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "���򤵤줿��å������������ä��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "�����Ԥβ��ۥե����(_N)..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "�����Ԥβ��ۥե����(_R)..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "��̾�β��ۥե����(_S)..."
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "�ե��륿Ŭ��(_A)"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "�ե�����إ��ԡ�(_C)"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "��å���������ե��륿�����(_C)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "��å�������ž��(_F)"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "�ݥ��٥�"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "�ե�����ذ�ư(_M)"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "�̾�ɽ��(_N)"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "�ġ���(_T)"
@@ -13103,7 +13479,7 @@ msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�Ĥ���(_C)"
@@ -13134,11 +13510,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "���Υ�å������� S/MIME �Ź�ǧ�ڤ��Ѥ��ưŹ沽���ޤ�"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "�ե����ޥå�(_O)"
+#, fuzzy
+msgid "For_mat"
+msgstr "��"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13186,7 +13564,7 @@ msgid "Save in folder..."
 msgstr "�ե��������¸..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "���ߤΥե��������¸���ޤ�"
 
@@ -13279,7 +13657,7 @@ msgid "_From Field"
 msgstr "���пͥե������(_F)"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "����(_I)"
 
@@ -13295,7 +13673,7 @@ msgstr "�ֿ���ե������(_R)"
 msgid "_Security"
 msgstr "�������ƥ�(_S)"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "�إ��(_H)"
 
@@ -13531,10 +13909,6 @@ msgstr "���硼�ȥ��å�(_S)"
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "���ե饤����(_W)"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "���Υե������������ѹ�"
@@ -13609,132 +13983,136 @@ msgstr ""
 "����\n"
 "�ޥ����α��ܥ���ǽ̾����ޤ���"
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "���ߤ�ɽ��(_C)"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "ɽ�������"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "��"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "���֤ϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "���3��"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "����衼���å�"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "������"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "���ꥷ���"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "���ܸ�"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "�ڹ��"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "�ȥ륳��"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "������˥�"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "�˥塼��"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "������ʸ�������ɥ��å�: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "���Ѥ��륭��饯�����åȤ����Ϥ��Ƥ�������"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "����¾..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "���󥳡��ǥ���"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "�������Խ�"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "��¸�����������ɲ�"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "���٤�ɽ��"
 
@@ -13777,18 +14155,176 @@ msgstr "�ѡ����ʥ륢�ɥ쥹Ģ������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "%s ����Ϥޤꡢ%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "%s ����Ϥޤ륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "���ݥ���ȤˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "%s �˻Ϥޤꡢ%s �˽���륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "%s �˻Ϥޤ륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "%s �˽���륿�����ˤĤ��Ƥ�����"
+
+#~ msgid "Notification about your task"
+#~ msgstr "�������ˤĤ��Ƥ�����"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "̤���� %s"
+
+#~ msgid "_Invite Others"
+#~ msgstr "¾�ξ���(_I)..."
+
+#~ msgid "_Confidential"
+#~ msgstr "��̩(_C)"
+
+#~ msgid "<b>Summary:</b> %s<br><br>"
+#~ msgstr "<b>���ޥ�:</b> %s<br><br>"
+
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "<b>����:</b> %s"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail maildir �����Υ᡼��ե�����"
+
+#~ msgid "Summarising folder"
+#~ msgstr "�ե�����Υ��ޥ�������"
+
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GNOME ������: "
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "GPG/PGP �ץ����������꤬����ޤ���"
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
+
+#~ msgid "Encrypted message"
+#~ msgstr "�Ź沽���줿��å�����"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "��������򥯥�å��������沽���Ƥ�������"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "�ե���� `%s' ��Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "RJTT:RJAA:RJTA"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "RJTT:RJAA:RJTA"
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "��ȱ�"
+
+#~ msgid "Volcanic ash w/ thunders"
+#~ msgstr "��Ȳл���"
+
+#~ msgid "M_etric"
+#~ msgstr "�᡼�ȥ�ˡ(_E)"
+
+#~ msgid "Units: "
+#~ msgstr "ñ��: "
+
+#~ msgid "_Imperial"
+#~ msgstr "����ڥꥢ��ˡ(_I)"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "�ե����̾�ˤϥǥ��쥯�ȥ���ڤ�ʸ���ϻȤ��ޤ���"
+
+#~ msgid "Ximian Evolution"
+#~ msgstr "Ximian Evolution"
+
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution �� GNOME �ǥ����ȥå�\n"
+#~ "�Ķ��ǤΥ᡼�롤��������������\n"
+#~ "Ϣ����ޥ͡������ȤΤ����\n"
+#~ "���롼�ץ��������ץꥱ�������Ǥ�"
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution - %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
+#~ "����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
+#~ "\n"
+#~ "Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
+#~ "�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
+#~ "\n"
+#~ "�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
+#~ "���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
+#~ "\n"
+#~ "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
+#~ "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr "Ximian Evolution��������\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "�ե����ޥå�(_O)"
+
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr ""
 #~ "%s�˥����������뤿����Żҥ᡼�륢�ɥ쥹�ȥѥ���ɤ����Ϥ��Ƥ�������"
@@ -13812,9 +14348,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ "���ä�! `%s' �Υӥ塼��������˴���ޤ��� :-(\n"
 #~ "����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
 
-#~ msgid "_Calendar Information:"
-#~ msgstr "����������(_C):"
-
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
 #~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ�"
@@ -13932,10 +14465,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr "%Y/%m/%d (%a)"
 
 #, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
-#, fuzzy
 #~ msgid "No such folder /%s"
 #~ msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
diff --git a/po/ko.po b/po/ko.po
index 5220d39d66..cb3bdada94 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-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\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"
@@ -16,6 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import VCard files into Evolution."
@@ -26,309 +36,314 @@ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 msgid "Imports VCard files into Evolution."
 msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 #, fuzzy
 msgid "File As"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "�̸�"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "�̸���"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "�μ�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "�ٻ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "ȸ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "����"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "�ڵ���"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "���� �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "���� �ѽ�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "�� �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "���� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "�ٻ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "�� 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "��Ÿ"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "��Ÿ �ѽ�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�߻�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "�̸��� 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "�̸��� 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "�� ����Ʈ"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "�μ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "�繫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "�繫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "��Ʈ"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "�޷�"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "�����(_v):"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "����: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "���� �̸�"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "ī��: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -336,37 +351,37 @@ msgstr ""
 "\n"
 "�̸�: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -374,7 +389,7 @@ msgstr ""
 "\n"
 "����: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -382,25 +397,25 @@ msgstr ""
 "\n"
 "�ּ�:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -408,7 +423,7 @@ msgstr ""
 "\n"
 "  ��/��:          "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -416,7 +431,7 @@ msgstr ""
 "\n"
 "  ����:        "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -424,7 +439,7 @@ msgstr ""
 "\n"
 "  ���� ��ȣ:   "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -432,13 +447,13 @@ msgstr ""
 "\n"
 "  ����:        "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -446,7 +461,7 @@ msgstr ""
 "\n"
 "��ȭ��ȣ:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -454,7 +469,7 @@ msgstr ""
 "\n"
 "��ȭ��ȣ:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -462,7 +477,7 @@ msgstr ""
 "\n"
 "���ڿ���:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -470,13 +485,13 @@ msgstr ""
 "\n"
 "���ڿ���:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -484,7 +499,7 @@ msgstr ""
 "\n"
 "��: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -492,7 +507,7 @@ msgstr ""
 "\n"
 "������ ��ġ: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -500,7 +515,7 @@ msgstr ""
 "\n"
 "���� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -508,7 +523,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -516,31 +531,31 @@ msgstr ""
 "\n"
 "  �̸�:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -548,7 +563,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -566,13 +581,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -580,11 +595,11 @@ msgstr ""
 "\n"
 "���� Ű: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -593,89 +608,91 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "�˻�"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "��ٸ��� �� ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�޷� �ҷ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "wombat ������ ������ ���� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "wombat�� �����Ҽ� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -720,44 +737,44 @@ msgstr "�ּҷ�"
 msgid "Factory for the sample Addressbook control"
 msgstr "�ּҷ�"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP ����"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "�� ����ó"
@@ -792,7 +809,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr ""
 
@@ -877,16 +894,16 @@ msgstr "���� ����"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "�߰�(_A)"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "����(_E)"
@@ -906,22 +923,28 @@ msgstr "��Ʈ:"
 msgid "_Server name:"
 msgstr "���� ����::"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -929,50 +952,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "���"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "����..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "���:"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "���� Ž���Ⱑ ǥ���� URI"
 
@@ -986,54 +1009,54 @@ msgstr "���� Ž���Ⱑ ǥ���� URI"
 msgid "(none)"
 msgstr "(�̸� ����)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "�̸���"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "���ο� ����ó�� �����"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "�ּҷ� ����"
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "����ó ���� ����"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "����ó�� �߰�"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -1045,52 +1068,61 @@ msgstr "Evolution �ּҷ� �̸� ���� �������̽�"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "����"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "���� ����"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "�̸��� ������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:532
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1156,12 +1188,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "����ó ������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�ڼ���"
 
@@ -1230,9 +1262,9 @@ msgstr "����ó(_C)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "����(_D)"
@@ -1302,37 +1334,46 @@ msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 msgid "Delete Contact?"
 msgstr "����ó�� �����ұ��?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "����ó Quick �߰�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "���� �̸� ����"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "���� �̸�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "�̸���"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2460,7 +2501,7 @@ msgid "contact-list-editor"
 msgstr "����ó ������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "����ó ������"
@@ -2510,156 +2551,163 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "���� �˻�"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "�˻�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "�޷� �μ��ϱ�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " %d �ʸ���"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard�� ����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "�μ�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "���� �μ�(_v)..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "�� ������ ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "�������ο��� �۾�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "�۵��� �������� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "��ҵ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "����� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2669,7 +2717,7 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2677,87 +2725,96 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* ����ó�� �߰��ϱ� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 #, fuzzy
 msgid "Primary Phone"
 msgstr "�̸���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 #, fuzzy
 msgid "Business Phone"
 msgstr "���� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "ȸ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 #, fuzzy
 msgid "Home Phone"
 msgstr "�� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Business Address"
 msgstr "���� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Home Address"
 msgstr "�ּ� Ȯ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "�޴���ȭ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "���� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "�� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Other Phone"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 #, fuzzy
 msgid "Other Address"
 msgstr "�ּ� Ȯ��"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "�ּҷϿ� ����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2940,97 +2997,111 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�۲�..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "�޷� �μ��ϱ�"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "�޷� �μ��ϱ�"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "���� �μ�(_v)..."
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "����� �����ϱ�"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "����"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "����"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "����"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "���Ǿȵ�"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "�ּҷ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
@@ -3042,49 +3113,29 @@ msgstr "�˶� ���"
 msgid "Factory for the alarm notification service"
 msgstr "�˶� ����� ���� ���丮"
 
-#: 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: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: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:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
-msgid "Notification about your appointment"
-msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
-
-#: 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�� ��� �ð� �˸�"
+msgid "Starting:"
+msgstr "����..."
 
-#: 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:218
+msgid "Ending:"
+msgstr ""
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "����ġ�� �ð�(_E):"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 #, fuzzy
-msgid "Notification about your task"
-msgstr "Evolution�� ���� ����"
+msgid "Evolution Alarm"
+msgstr "Evolution ��ġ"
 
-#: 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�� �˶�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "���� �ɼ�"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3105,11 +3156,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "����� �����ϱ�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3117,7 +3168,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3128,37 +3179,37 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "�׳��� �ʱ�ȭ �Ҽ� �����ϴ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+msgid "Could not create the alarm notify service"
+msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%Y/%m/%d"
@@ -3166,152 +3217,136 @@ msgstr "%Y/%m/%d"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "�ٻ�"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "���� ����"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "�Ϸ��"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "�ݺ���"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "�����"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "�ƴϿ�"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "�˻�"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "ī��: "
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "��"
@@ -3331,12 +3366,12 @@ msgstr "����:"
 msgid "Comment contains"
 msgstr "������������"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "�޷�"
 
@@ -3344,9 +3379,9 @@ msgstr "�޷�"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�۾�"
@@ -3356,26 +3391,26 @@ msgstr "�۾�"
 msgid "Folder containing to-do items"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "���ο� ��Ӹ� �����"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "�۾�"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "�޷��� ǥ���� URI"
 
@@ -3451,52 +3486,52 @@ msgstr "��"
 msgid "minutes"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr "�Ϸ羿"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d �־�"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr " ���־�"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr " �ѽð���"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ���"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr "�Ϻи���"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d �ʸ���"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " 1 �ʸ���"
@@ -3556,17 +3591,12 @@ msgstr "��� ���� ��"
 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
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s ���� ���� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3588,7 +3618,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���"
 
@@ -3619,7 +3649,7 @@ msgstr "��� ��"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "��"
 
@@ -3676,7 +3706,7 @@ msgid "First day of wee_k:"
 msgstr "�������� ù°��:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "�ݿ���"
 
@@ -3691,7 +3721,7 @@ msgid "Minutes"
 msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "������"
 
@@ -3700,7 +3730,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "�����"
 
@@ -3724,7 +3754,7 @@ msgid "Su_n"
 msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "�Ͽ���"
 
@@ -3743,7 +3773,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "�����"
 
@@ -3769,12 +3799,12 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "ȭ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "������"
 
@@ -3856,173 +3886,178 @@ msgstr "��"
 msgid "before the start of the appointment"
 msgstr "��ӽ�����"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "�Ϸ��"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "�Ϸ��"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "����� �����Ѵ�"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "������ �� ������� ����� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "������ �� ������� �۾��� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "������ �� ������� ���������� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
@@ -4042,26 +4077,26 @@ msgstr "������"
 msgid "Enter Delegate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "���"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "����"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "���� ���"
@@ -4082,11 +4117,12 @@ msgid "Classification"
 msgstr "�з�"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "���� ��¥"
@@ -4097,12 +4133,12 @@ msgid "F_ree"
 msgstr "��"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "���� Ű(_b)"
 
@@ -4113,7 +4149,7 @@ msgid "Show Time As"
 msgstr "����"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "���(_u):"
 
@@ -4125,35 +4161,19 @@ msgstr "����ġ�� �ð�(_E):"
 msgid "_Start time:"
 msgstr "���� �ð�(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "�� ������"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "�� ������"
-
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Non-Participants"
-msgstr "�� ������"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "����..."
@@ -4199,6 +4219,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4217,7 +4238,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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4233,8 +4254,8 @@ msgid "_Change Organizer"
 msgstr "����:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4246,23 +4267,23 @@ msgstr "����:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr ""
 
@@ -4328,19 +4349,15 @@ msgstr "��"
 msgid "year(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4359,7 +4376,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4371,145 +4388,173 @@ msgstr "�켱����(_P):"
 msgid "_Status:"
 msgstr "����(_S):"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "����:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "���� ��¥(_r):"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "����ó�� �����"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "�۾���Ͽ� �߰��ϱ�"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "�Ϸ��"
@@ -4541,8 +4586,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "���"
 
@@ -4555,336 +4600,418 @@ msgstr "�۾�"
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "���÷� �̵�(_T)"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "��¥�� �̵�..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "�� ����� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "���� ������ ����"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�� �޼����� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "�Ϸ��"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "����� ����"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "�޷�"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "�� ������ ����"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "������ ��������"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "�۾�"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Ȯ��"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "�ݴ�"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "����:"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "��ҵ�"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "������ ��������"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "�۾��е�"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "�۾�"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "ȸ��"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "�޼��� �μ�"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "���� ��¥"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4926,86 +5053,105 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "�� ������"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "�� ������"
+
+#: calendar/gui/e-meeting-model.c:97
+#, fuzzy
+msgid "Non-Participants"
+msgstr "�� ������"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "�׷� �̸�:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "�������:"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "����"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "�ݴ�"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "������"
@@ -5013,114 +5159,120 @@ 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:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "�繫�� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "�ٸ� �̵��� �ʴ�(_I)..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "ȸ�� ���� �ð�(_s):"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "%s ������ ����"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�� ���..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "�޷� ����"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -5178,234 +5330,280 @@ msgstr "�ÿ�"
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "�۾�"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "����(_S):"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "�켱����(_P):"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "�ۼ�Ʈ �Ϸ�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "%s ����"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"���: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "����ó(_C)"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "�� �׸��� �μ�"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "�μ� ����"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "ǥ���� �۾� ������ URI URI"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5413,125 +5611,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5560,7 +5758,7 @@ msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 msgid "Decryption is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5568,7 +5766,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5576,108 +5774,108 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�޼��� %s�� ��������"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� ��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "�޼��� ����"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5686,7 +5884,7 @@ msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5695,190 +5893,190 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(�˼����� ����)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "���������� �д��� ���� �߻�: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�ӽ� ������ ����� ����: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5898,7 +6096,7 @@ msgid "Connection cancelled"
 msgstr "������ ��ҵ�"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5908,12 +6106,12 @@ msgid "(unknown host)"
 msgstr "(�𸣴� ȣ��Ʈ)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6011,7 +6209,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -6029,8 +6227,8 @@ msgid "Unknown authentication state."
 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "��й�ȣ"
 
@@ -6059,55 +6257,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6154,17 +6352,17 @@ msgstr "�޼����� ������ ÷���մϴ�"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6172,7 +6370,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6182,7 +6380,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6194,37 +6392,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -6260,61 +6458,61 @@ msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����κ��� ����ġ���� OK�亯�� ��: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "�� ������ �ۼ��մϴ�"
@@ -6324,7 +6522,7 @@ msgstr "�� ������ �ۼ��մϴ�"
 msgid "Check for new messages in all folders"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "����"
 
@@ -6357,28 +6555,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6386,90 +6584,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "���� ����"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6482,23 +6682,28 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "���޵� �޽��� - %s"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6507,35 +6712,35 @@ msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "�׷� �޼��� ����"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6544,19 +6749,19 @@ msgstr ""
 "���� `%s'�� ����� ����:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6573,29 +6778,34 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "�۾� ���"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6604,146 +6814,154 @@ msgstr ""
 "�޼����� ������ ����: %2$s �������� %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "���� ����ȭ"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "���߿� �޼����� �����ϴ�"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -6755,459 +6973,440 @@ msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "������ ���"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"���� ���� %s�� �� ���� �����ϴ�:\n"
-"%s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "�޼��� %s�� ã���� ����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "�������� �׷����� ������ ����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "POP ����� ������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP �޼��� %d�� ������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "�޼��� �Ӹ���"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "������ ���� �����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "�� ������ �����մϴ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "�޼������� ���� ����� �˾Ƴ����� ����"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail�� ���� ���� ����"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "������ �ʿ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7215,168 +7414,168 @@ msgid ""
 "\n"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "�޼����� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "����:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "÷��"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "÷������ ��Ͽ��� ������ �׸��� �����մϴ�"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "÷������ �߰�..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
@@ -7408,52 +7607,52 @@ msgstr "MIME ����:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "���� ���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "ȸ�� �ּ�:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�޼����� �纻�� ���� ����� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7464,52 +7663,52 @@ msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 msgid "Attach a file"
 msgstr "������ ÷���մϴ�"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "���"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7518,7 +7717,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7527,7 +7726,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7536,13 +7735,13 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7552,29 +7751,40 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "���޵� �޽���"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "���� ����"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "�ؽ�Ʈ ���� ����"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
+"�޽��� �ۼ�â�� ���� ���� �����ϴ�."
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7582,11 +7792,11 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr ""
 
@@ -7645,15 +7855,24 @@ msgstr "����"
 msgid "Subject does not contain"
 msgstr "������������"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "�� ��й�ȣ ���"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y/%m/%d %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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y/%m/%d %H:%M"
 
@@ -7712,30 +7931,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7866,7 +8085,7 @@ msgstr "���� ����"
 msgid "Add action"
 msgstr "���� �߰�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7875,16 +8094,16 @@ msgstr ""
 "��, ���� ������ ���� �����̳׿�.\n"
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "���� ����"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "���� URI�� �����ϼ���"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<������ �������� ���� ��������>"
 
@@ -7901,40 +8120,40 @@ msgstr ""
 msgid "Test"
 msgstr "�׽�Ʈ"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "��Ģ �̸�: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "�������"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "��� ������ �� ������ ��"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "� �����̶� ������ ��"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "���� �߰�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "incoming"
 msgstr "�����°�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "outgoing"
 msgstr "�����°�"
@@ -8129,7 +8348,7 @@ msgstr "ȸ��"
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "������"
 
@@ -8163,7 +8382,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -8176,16 +8395,16 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 #, fuzzy
 msgid "Add Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "���� �̸� ����"
@@ -8194,106 +8413,101 @@ msgstr "���� �̸� ����"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "��������"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" ������ ��"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "����"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "ī��: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "�ּҷ� �߰�"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP ������ ���캾�ϴ�"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "���� ��¥(_S):"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "����..."
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "�μ�"
@@ -8331,261 +8545,266 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "���� ����"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "���� ����"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "���� ����"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "����(_P)..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"������ ����"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "������"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�޼��� �μ�"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "�ٸ��̸����� ����(_S)..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "���� ������ ǥ��(_k)"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�߿�"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "������ �̵�(_M)..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "�ǻ츲(_U)"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "�ּҷ� �߰�"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "����"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8611,33 +8830,43 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "����"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "���� ���� ����:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "����(_I)"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "���Ϲڽ� ����"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "�� ���� ����:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr ""
 
@@ -8656,17 +8885,17 @@ msgstr "Evolution ��ġ"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "����:"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8677,7 +8906,7 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8693,55 +8922,55 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "�ǻ츲"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 #, fuzzy
 msgid "Really delete account?"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "���� ����(_M)..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8749,126 +8978,126 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�̸��� ������"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "�� ������ ����"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8876,32 +9105,32 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "���� �Ÿ���(_F)..."
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
@@ -8943,17 +9172,17 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "����"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8964,16 +9193,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -8990,32 +9219,32 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "����"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Accounts"
 msgstr "����"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9028,29 +9257,25 @@ msgstr "����:"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Authentication Type: "
-msgstr "���� ����:"
+msgid "Checking for New Mail"
+msgstr "�� ������ �ۼ��մϴ�"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "���� �ۼ�"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9060,368 +9285,394 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "ǥ��"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 #, fuzzy
 msgid "Drafts"
 msgstr "�ʰ�"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Drafts folder:"
-msgstr "�� ������ ����"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Edit..."
 msgstr "����"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "�ݴ�"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "���Ϲڽ� ����"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP ����"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "����"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "�ο�(_Q)"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "�� ��й�ȣ ���"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "�޾���"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "����� ����"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Security"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "������ ��������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Sent"
 msgstr "����"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "�޼����� ������ ����"
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Sent messages folder:"
-msgstr "�޼����� ������ ����"
+msgid "Ser_ver requires authentication"
+msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
-msgstr "���� ����: "
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server requires _authentication"
-msgstr "������ ������ �䱸�մϴ�"
+msgid "Server _Type: "
+msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "���� ����:"
+
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "_Automatically check for new mail"
+msgstr "�� ������ �ۼ��մϴ�"
+
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "�� ������ ����"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "ȣ��Ʈ:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "�̸�:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "�� ��й�ȣ ���"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "�⺻���� ������ HTML�������� ����"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "���� ����: "
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "������̸�:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "����"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "��."
 
@@ -9467,209 +9718,201 @@ msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 msgid "Could not create a S/MIME decode context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "÷������ ����"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "��ũ�� ����..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "%s���� ����..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�޽��� ������ �о�帲"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "�����Ѱ� ����"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "������ ����(_f)... (��ĥ����)"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "�޴»��"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "����:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "���� ����:"
 
-#: mail/mail-format.c:1370
-#, fuzzy
-msgid "No GPG/PGP program configured."
-msgstr "GPG/PGP ���α׷��� �����ϴ�."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "��ȣȭ�� �޽����� ����������"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "��ȣȭ�� �޼���"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���� �缳��"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s ����"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9678,26 +9921,7 @@ msgstr ""
 "�۾� ������ ������ �߻��߽��ϴ�:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "�� ��й�ȣ ���"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "��й�ȣ"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr ""
 
@@ -9706,122 +9930,115 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "������ ����"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ������ ��"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "�޼����� ����"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "�Ϸ��"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�޽������� %s�� �̵�"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�޽������� %s�� ����"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"`%s'�� ������\n"
-"������ ���� �����ϴ�."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "�̵���"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "������"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "���޵� �޽���"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "���� ����"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�޼��� %s�� ��������"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "�޼������� ��������"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�޽������� ����"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9830,7 +10047,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9839,11 +10056,11 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "÷�� ����"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9852,17 +10069,17 @@ msgstr ""
 "��� ������ ����� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "�޾���"
@@ -9871,110 +10088,120 @@ msgstr "�޾���"
 msgid "_Search"
 msgstr "�˻�(_S)"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(�������)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "�޼���"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "�޼����� ����"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "����"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Find:"
 msgstr "�"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "���:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "����ϴ� ��..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "���� ����: "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "���� �ְ��ޱ�"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "��ҵ�"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 #, fuzzy
 msgid "Updating..."
 msgstr "������ ..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "��ٸ��� �� ..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "��ҵ�."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 #, fuzzy
 msgid "User canceled operation."
 msgstr "����� ����"
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "��й�ȣ"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���޵� �޽��� - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s ������ ����"
@@ -9984,7 +10211,7 @@ msgstr "%s ������ ����"
 msgid "Updating vfolders for uri: %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9993,30 +10220,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "���� ����"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "�������� ����"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "�� ��������"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "����: (���� ����)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "�޼���"
@@ -10077,7 +10304,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "�޽������� ����"
@@ -10104,27 +10331,27 @@ msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "����"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10169,133 +10396,129 @@ msgstr "���� ����"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "���"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "��� ����"
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
-msgstr ""
+#: my-evolution/e-summary-calendar.c:377
+#, fuzzy
+msgid "%k:%M %d %B"
+msgstr "���� %l:%M %p"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "���� %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "���"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "�̸�:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "���� ����(_M)..."
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>�޷¸� �д��� ����</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "����:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "��Ÿ"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "����:"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "���"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "�޼��� �μ��� ����"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
@@ -10357,7 +10580,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10435,1078 +10658,1079 @@ msgstr "��Ʈ(_t):"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "����"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "�ٽ� ã��"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 #, fuzzy
 msgid "Moderate snow"
 msgstr "���� ����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "���̾�α� ����"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "�̸���"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "������ ����"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "�� ������ ����"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "ȸ�� ����:"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "����"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "�� â�� �ݽ��ϴ�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "����"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "�� â�� �ݽ��ϴ�"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "����"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "�Ӹ���:"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "��"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "���� ����"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "���̾�α� ����"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "����"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "�ٽ� ã��"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11516,8 +11740,9 @@ msgid " _Remove"
 msgstr "����"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
-msgstr ""
+#, fuzzy
+msgid "Add n_ews feed"
+msgstr "�� ��������(_N)"
 
 #: my-evolution/my-evolution.glade.h:3
 #, fuzzy
@@ -11533,12 +11758,12 @@ msgstr "����"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11583,14 +11808,14 @@ msgid "Show _today's tasks"
 msgstr "����"
 
 #: my-evolution/my-evolution.glade.h:18
+msgid "Show temperatures in:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Tasks "
 msgstr "�۾�"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "Weather settings"
@@ -11612,14 +11837,14 @@ msgid "_Displayed feeds:"
 msgstr "ǥ��"
 
 #: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_Five days"
 msgstr "�ݿ���"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Imperial"
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_Mail"
@@ -11658,38 +11883,38 @@ msgstr "�ڼ���"
 msgid "Cancel Operation"
 msgstr "���� ���"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "���� ����"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution ��ġ"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "������ ��ġ�ҷ��� \"Ȯ��\", �������� \"���\"�� ��������."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11699,14 +11924,14 @@ msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "������ �д� ���� ���� �߻�"
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11714,7 +11939,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11723,7 +11948,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11731,6 +11956,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution ��ġ"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -11747,61 +11985,67 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "������ ����"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "������ �̵�"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "����"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "%s ������ ����"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "�����Ͻ� ������ �̸��� ���������ʽ��ϴ�"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11811,54 +12055,29 @@ msgstr ""
 "���õ� ������ ������ �� �����ϴ�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "�����ڰ� ������������"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-"%s ���丮�� ������ ���� �����ϴ�:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "�����Ͻ� ������ �̸��� ���������ʽ��ϴ�"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �� ���� ����"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "���ο�..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(�������)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11867,13 +12086,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11881,7 +12100,7 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11890,16 +12109,16 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ %d�� ������."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11908,11 +12127,11 @@ msgstr ""
 "������ ������ ���ִ� ������ �����ϴ�\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11921,17 +12140,17 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11940,142 +12159,151 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ 1�� ������."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "���� �̸�:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "������ ��������"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "���� ����:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "���� ���:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "�����ڰ� ������������"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã���� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "About Ximian Evolution"
 msgstr "Evolution��..."
 
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution �� �׳� ����ũž ȯ�濡�� ���ڿ���, \n"
-"����, ����ó ������ �ϴ� �׷���� �������α׷�\n"
-"���� �Դϴ�."
-
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "���� �̵�..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "���� ������ ����: %s: %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Work Offline"
+msgstr "�������ο��� �۾�"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
 
@@ -12083,46 +12311,36 @@ msgstr "�������ο��� �۾�"
 msgid "(No folder displayed)"
 msgstr "(ǥ�õ� ������ ����)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(�̸� ����)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12130,36 +12348,32 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Ȯ��"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "���� ���� Druid"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "�׷� �̸�:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12168,187 +12382,292 @@ msgstr ""
 "���� ����κ��� `%s'�׷���\n"
 "������ ����ðڽ��ϱ�?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "������������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "���� ������(_S)"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "���� ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "ū ������(_L)"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "ū ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "���� ���� ���߱�(_H)"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "���� ���븦 ����ϴ�"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "��Ģ �̸�: "
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "����"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 #, fuzzy
 msgid "Shortcuts"
 msgstr "���� ����(_S)"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(�̸� ����)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "���� ����"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "���� �̸��� ������ �̹� �����մϴ�"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "����� ����"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "������ ����⿡ ����� ������ ����"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% �Ϸ�(_p):"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "����� ����"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "÷��"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "(�̸� ����)"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
+
+#: shell/evolution-shell-component.c:1021
+msgid "Unsupported type"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "����� ����"
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "����� ����"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "����(_x)"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "�޷�"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "%s���� ������ ����"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "�޼����� �޾ҽ��ϴ�"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "�� ������ ����"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12452,78 +12771,73 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 #, fuzzy
 msgid "Importers"
 msgstr "��������"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 #, fuzzy
 msgid "Don't import"
 msgstr "������������"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "���� ����(_M)..."
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"�����մϴ�\n"
-"Evolution ��\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �Ҽ� �����ϴ�."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "������ �д��� ���� �߻�: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "���� ����"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "�ؽ�Ʈ ���� ����"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "�����ڰ� ������������"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12624,7 +12938,7 @@ msgstr "���"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "�ൿ(_A)"
@@ -12648,7 +12962,7 @@ msgid "_Forward Contact..."
 msgstr "����ó(_C)..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "�μ�(_P)..."
@@ -12700,7 +13014,7 @@ msgstr "�����"
 msgid "Delete the appointment"
 msgstr "�� ����� �����մϴ�"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "����"
 
@@ -12839,11 +13153,12 @@ msgstr "�μ�..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "����"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "������ ��ħ"
 
@@ -12861,7 +13176,7 @@ msgstr "�並 %s�� ����"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "����(_F)"
@@ -12883,7 +13198,7 @@ msgstr "����� �������� ���̾�α׸� �ݴ´�"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "����(_S)"
 
@@ -12952,11 +13267,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "Evolution��..."
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "��ҵ�"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13232,325 +13542,355 @@ msgstr "�޽����κ��� ���� ���� ����(_V)"
 msgid "Create a virtual folder for this subject"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "��� �޽��� ��� ���̱�"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "�� �޼����� �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "�ؽ�Ʈ ���� ����"
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "���޵� �޽���"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "�߿�"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "���� ���� ������ ǥ��"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "�̵�"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "�޼����� �� ������ �̵��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "�޼���"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "��Ÿ�� ����(_T)"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "ȸ��"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "��ü ȸ��"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "���� �޼���(_M)"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "��� ��� ����(_H)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "�����ڿ����� ��������(_R)"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "���񿡵��� ��������(_S)"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "�Ÿ��� ����(_A)"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "������ ����"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "���޵� �޽���"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "�߻�"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "������ �̵�"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "����(_T)"
@@ -13561,7 +13901,7 @@ msgstr "�� â�� �ݽ��ϴ�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�ݱ�(_C)"
@@ -13593,11 +13933,12 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "����(_o)"
+#, fuzzy
+msgid "For_mat"
+msgstr "����"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13647,7 +13988,7 @@ msgid "Save in folder..."
 msgstr "������ ����..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "���� ������ ����"
 
@@ -13743,7 +14084,7 @@ msgid "_From Field"
 msgstr "�߽� �׸�(_F)"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "����(_I)"
 
@@ -13759,7 +14100,7 @@ msgstr "ȸ�� �ּ� �׸�(_R)"
 msgid "_Security"
 msgstr "����(_S)"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "����(_H)"
 
@@ -14023,11 +14364,6 @@ msgstr "���� ����(_S)"
 msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Work Offline"
-msgstr "�������ο��� �۾�"
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -14116,139 +14452,143 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "��"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 #, fuzzy
 msgid "New"
 msgstr "����"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "��Ÿ"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "����ó ������"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "�޷¿� �߰�"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "���(_l)"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "��� ����"
 
@@ -14292,19 +14632,124 @@ msgstr "���ο� �ּҷ� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
 #, fuzzy
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "Evolution�� ���� ����"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "%A %b %d %Y %H:%M�� �˶�"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "�� ������ ����"
+
+#, fuzzy
+#~ msgid "_Invite Others"
+#~ msgstr "�ٸ� �̵��� �ʴ�(_I)..."
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "������ ���"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "���� ���� %s�� �� ���� �����ϴ�:\n"
+#~ "%s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "ī��: "
+
+#, fuzzy
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "GPG/PGP ���α׷��� �����ϴ�."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "��ȣȭ�� �޽����� ����������"
+
+#~ msgid "Encrypted message"
+#~ msgstr "��ȣȭ�� �޼���"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "`%s'�� ������\n"
+#~ "������ ���� �����ϴ�."
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution��..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution �� �׳� ����ũž ȯ�濡�� ���ڿ���, \n"
+#~ "����, ����ó ������ �ϴ� �׷���� �������α׷�\n"
+#~ "���� �Դϴ�."
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "�����մϴ�\n"
+#~ "Evolution ��\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "����(_o)"
+
+#, fuzzy
 #~ msgid "LDAP Authentication"
 #~ msgstr "����:"
 
@@ -14323,10 +14768,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ "%s ������Ʈ�� ����ϽŰ� �����ϴ�."
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "����� ����"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "��ӽ�����"
 
@@ -14468,10 +14909,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Delegated From:"
 #~ msgstr "������"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "(�̸� ����)"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% �Ϸ�(_p):"
 
@@ -14565,9 +15002,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "����(_C) (��ĥ����)"
 
-#~ msgid "_Index"
-#~ msgstr "����(_I)"
-
 #~ msgid "_Mail message"
 #~ msgstr "���� �޼���(_M)"
 
@@ -14591,9 +15025,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Find..."
 #~ msgstr "�..."
 
-#~ msgid "Open calendar"
-#~ msgstr "�޷� ����"
-
 #~ msgid "Save calendar"
 #~ msgstr "�޷� ����"
 
@@ -14606,9 +15037,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Edit Task"
 #~ msgstr "�۾� ����"
 
-#~ msgid "Percent complete"
-#~ msgstr "�ۼ�Ʈ �Ϸ�"
-
 #~ msgid "Mark the task complete"
 #~ msgstr "�۾��� �Ϸ�Ǿ����� ǥ��"
 
@@ -14636,9 +15064,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Port number in URL `%s' is non-numeric"
 #~ msgstr "URL `%s'���ִ� ��Ʈ ��ȣ�� ���ڰ� �ƴմϴ�"
 
-#~ msgid "Inline attachment"
-#~ msgstr "÷��"
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "������ �ֱ���ѵ� ���� ���� ���׿�."
 
@@ -14661,9 +15086,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Send an email to %s"
 #~ msgstr "%s�� �̸��� ������"
 
-#~ msgid "Run %s"
-#~ msgstr "%s ����"
-
 #~ msgid "Close %s"
 #~ msgstr "%s �ݱ�"
 
diff --git a/po/lt.po b/po/lt.po
index a747ce2db6..d236808f22 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2001-10-26 00:34+0200\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-28 22:33+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Your language <komp_lt@konferencijos.lt>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Gamykla importuoti VCard byloms � Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importuoja VCard bylas � Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Gamykla importuoti VCard byloms � Evolution."
@@ -21,291 +31,296 @@ msgstr "Gamykla importuoti VCard byloms � Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importuoja VCard bylas � Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Saugoti kaip"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Vardas"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "El. pa�tas"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 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:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 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:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Darb"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Kompanijos"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 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:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Nam�"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Automobilinis"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Darb faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Nam� faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Darbo 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Darb 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Nam� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Ie�kas"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "El. pa�tas 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "El. pa�tas 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Departamentas"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Dep"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Ofis"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titulas"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profesija"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Vad"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asist"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Pravard�"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Prav"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Pastaba"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalendoriaus URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Laisvas-u�si�m�s URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "LUUrl"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Jubiliejus"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Jubil"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Gimimo data"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorijos"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Pavard�"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kortel�: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +328,7 @@ msgstr ""
 "\n"
 "Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,7 +336,7 @@ msgstr ""
 "\n"
 "  Prie�d�lis: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -329,7 +344,7 @@ msgstr ""
 "\n"
 "  Vardas:     "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 "  Papildomas: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 "  Pavard�:    "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "  Gal�n�:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,7 +392,7 @@ msgstr ""
 "\n"
 "  Pa�to d���:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -385,7 +400,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -393,7 +408,7 @@ msgstr ""
 "\n"
 "  Gatv�:       "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -401,7 +416,7 @@ msgstr ""
 "\n"
 "  Miestas:     "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -409,7 +424,7 @@ msgstr ""
 "\n"
 "  Regionas:    "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -417,7 +432,7 @@ msgstr ""
 "\n"
 "  Pa�to kodas: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -425,7 +440,7 @@ msgstr ""
 "\n"
 "  Valstyb�:    "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -433,7 +448,7 @@ msgstr ""
 "\n"
 "Siunt� tarnyba: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -441,7 +456,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -449,7 +464,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -457,7 +472,7 @@ msgstr ""
 "\n"
 "El. pa�tas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -465,7 +480,7 @@ msgstr ""
 "\n"
 "El. pa�tas:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -473,7 +488,7 @@ msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -481,7 +496,7 @@ msgstr ""
 "\n"
 "Laiko juosta: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -489,7 +504,7 @@ msgstr ""
 "\n"
 "Geogr. vietov�: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -497,7 +512,7 @@ msgstr ""
 "\n"
 "Darbo pad�tis: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -505,7 +520,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -513,31 +528,31 @@ msgstr ""
 "\n"
 "  Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -545,7 +560,7 @@ msgstr ""
 "\n"
 "Kategorijos: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -563,7 +578,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -571,7 +586,7 @@ msgstr ""
 "\n"
 "Unikali eilut�: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -579,11 +594,11 @@ msgstr ""
 "\n"
 "Vie�as raktas: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Keletas VCard korteli�"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -592,16 +607,18 @@ 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:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1091
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Ie�koma..."
 
@@ -614,60 +631,60 @@ msgstr "�keliama..."
 msgid "Error in search expression."
 msgstr "Klaida paie�kos i�rai�koje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Jungiamasi prie LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Negal�jau prisijungti prie LDAP serverio."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Laukiama prisijungimo prie LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � LDAP server�..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Pa�alinama kortel� i� LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Paie�ka pradedama i� naujo."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Nepavyko �kelti �ymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:662
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Negal�jau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:663
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Negal�jau paleisti wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
@@ -713,38 +730,39 @@ msgstr "Adres� knygel�s adreso ???? gamykla"
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Aplankas, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Naujas _kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Naujas kontakt� _s�ra�as"
 
@@ -777,7 +795,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Esm�"
 
@@ -870,7 +888,7 @@ msgstr "_Prid�ti"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "K_eisti"
@@ -887,11 +905,20 @@ msgstr "_Prievadas:"
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Negal�jau inicializuoti gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -901,7 +928,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -913,7 +940,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:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -921,42 +948,42 @@ 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:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Vardas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "El. pa�tas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "I�sami..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
@@ -969,51 +996,51 @@ msgstr "URI, kur� rodys Aplank� nar�ykl�"
 msgid "(none)"
 msgstr "(jokio)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Pagrindinis el. pa�tas"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Pasirink veiksm�"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Sukurti nauj� kontakt� �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Prid�ti adres� prie esan�io kontakto �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "U�klausiama adres� knygel�..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Keisti kontakto informacij�"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Prid�ti prie kontakt�"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "�lieti el. pa�to adres�"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "U�drausti u�klausas"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Leisti u�klausas (Pavojinga!)"
 
@@ -1025,35 +1052,35 @@ 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:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Pa�alinti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Pa�alinti visus"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Si�sti HTML pa�t�?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Taisyti kontakt� s�ra��"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Bevardis kontakt� s�ra�as"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nerodom�)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
@@ -1067,7 +1094,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Pasirinkti kontaktus i� adres� knygel�s"
 
@@ -1127,12 +1162,12 @@ msgstr "Bendradarbiavimas"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontakt� redaktorius"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detal�s"
 
@@ -1202,8 +1237,8 @@ msgstr "_Kontaktai..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1273,46 +1308,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "I�trinti kontakt�?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "�is kontaktas priklauso �ioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 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:300
 msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 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:332
 msgid "E-mail"
 msgstr "El. pa�tas"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "s�ra�as"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2379,7 +2414,7 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontakt� s�ra�o redaktorius"
 
@@ -2428,13 +2463,13 @@ msgstr ""
 "Pakeistasis �io kontakto el. pa�tas ar vardas jau yra\n"
 "�iame aplanke. Ar nor�tum j� vis tiek prid�ti?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "I�sami paie�ka"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Paie�ka"
 
@@ -2453,9 +2488,9 @@ msgstr "%d korteli�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "I�saugoti kaip VCard"
@@ -2466,18 +2501,18 @@ msgid "Open"
 msgstr "Atidaryti"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persi�sti kontakt�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Si�sti lai�k� kontaktui"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2485,93 +2520,99 @@ msgid "Print"
 msgstr "Spausdinti"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "I�trinti"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 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:1889
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Kortel� nerasta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kortel�s ID jau egzistuoja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Ar nori i�saugoti pakeitimus?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Klaida pridedant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Klaida pridedant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 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:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,a,�,b,c,�,d,e,�,�,f,g,h,i,�,j,k,l,m,n,o,p,q,r,s,�,t,u,�,�,v,w,x,y,z,�"
@@ -2580,85 +2621,85 @@ msgstr ""
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,a,�,b,c,�,d,e,�,�,f,g,h,i,�,j,k,l,m,n,o,p,q,r,s,�,t,u,�,�,v,w,x,y,z,�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Spausk �ia, kad prid�tum kontakt� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Asistento telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Darbo telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Atsakiklio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Nam� telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Darbo adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Nam� adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Darbo telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Nam� telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Kitas telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Kitas adresas"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "ir %d kitoki� korteli�."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "ir viena kitokia kortel�."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "I�saugoti adres� knygel�je"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2845,63 +2886,72 @@ msgstr "Plotis:"
 msgid "_Font..."
 msgstr "�_riftas..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Spausdinti korteles"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Spausdinti kortel�"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Spausdinti vok�"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "K_eisti �vyk�"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Auk�tas"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normalus"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "�emas"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Neapibr��tas"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:617
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:725
-#: calendar/conduits/todo/todo-conduit.c:728
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negal�jau perskaityti piloto ToDo programos bloko"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays tasks."
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
@@ -2922,17 +2972,17 @@ msgid "Factory for the Calendar Summary component."
 msgstr "Kalendoriaus ap�valgos komponento gamykla."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Testinio komponento gamykla."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the sample Tasks control"
-msgstr "Testinio komponento gamykla."
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
@@ -2951,11 +3001,26 @@ msgstr "Aliarmo prane�imo tarnyba"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Nuostatos"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indeksuojama:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "blogas laikas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Persp�ti %s"
@@ -2977,11 +3042,11 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2993,7 +3058,7 @@ msgstr ""
 "si�st� lai�k�.  Evolution vietoj to parodys normal�\n"
 "u�uominos dialog�."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3004,114 +3069,117 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Negal�jau inicializuoti GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Negal�jau inicializuoti gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:417 calendar/gui/calendar-model.c:998
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Vie�as"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Laisvas"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-meeting-time-sel.c:410
-#: shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "U�imtas"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Neprad�ta"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "U�baigta"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3122,52 +3190,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Ne"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Ie�koma"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dien� rodinys"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Darbo savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
@@ -3183,26 +3253,27 @@ 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:1075
 msgid "Unmatched"
 msgstr "Netinkantys"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "U�duotys"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
@@ -3210,7 +3281,7 @@ msgstr "Aplankas, kuriame yra u�duotys"
 msgid "Create a new appointment"
 msgstr "Sukurti nauj� �vyk�"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Naujas �_vykis"
 
@@ -3223,7 +3294,7 @@ msgstr "Sukurti nauj� u�duot�"
 msgid "New _Task"
 msgstr "Nauja _u�duotis"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, kur� rodys kalendorius"
 
@@ -3293,110 +3364,110 @@ msgstr "valand�"
 msgid "minutes"
 msgstr "minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dien�"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 diena"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d savai�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 savait�"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d valand�"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 valanda"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minut�"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekund�"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: 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:378
+#: 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:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Pasi�sti lai�k�"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: 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:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Ne�inomas veiksmas, kur� reikia atlikti"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:407
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po �vykio prad�ios"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s �vykio prad�ios metu"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prie� �vykio pabaig�"
 
-#: calendar/gui/dialogs/alarm-page.c:424
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po �vykio pabaigos"
 
-#: calendar/gui/dialogs/alarm-page.c:429
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s �vykio pabaigos metu"
 
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3417,7 +3488,7 @@ msgstr "U�uominos"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
@@ -3500,7 +3571,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:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -3513,7 +3584,7 @@ msgid "Minutes"
 msgstr "Minu�i�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -3522,7 +3593,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:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "�e�tadienis"
 
@@ -3543,7 +3614,7 @@ msgid "Su_n"
 msgstr "_Sek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -3560,7 +3631,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:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -3581,12 +3652,12 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Antradienis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
@@ -3655,117 +3726,122 @@ msgstr "_Tre"
 msgid "before the start of the appointment"
 msgstr "prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Susitikimo b�sena pasikeit�. Ar si�sti atnaujint� versij�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �� susitikim�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �i� u�duot�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �� �urnalo �ra��?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "�is �vykis buvo i�trintas."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "�i u�duotis buvo i�trinta."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "�is �urnalo �ra�as buvo i�trintas."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Tu ka�k� pakeitei. U�mir�ti tuos pakeitimus ir u�daryti redaktori�?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Tu nieko nepakeitei, u�daryti redaktori�?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "�is �vykis buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "�i u�duotis buvo pakeista."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "�is �urnalo �ra�as buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Tu ka�k� pakeitei. U�mir�ti tuos pakeitimus ir atnaujinti redaktori�?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktori�?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " iki "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (U�baigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "U�baigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Negal�jau tvarkingai atnaujinti byl�"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3774,53 +3850,53 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "U�ra�yti j�?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, 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:94
+#: calendar/gui/dialogs/delete-comp.c:99
 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:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, 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:103
+#: calendar/gui/dialogs/delete-comp.c:108
 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:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, 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:112
+#: calendar/gui/dialogs/delete-comp.c:117
 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:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, 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:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, 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:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ar tu tikrai nori i�trinti %d �urnalo �ra��?"
@@ -3837,25 +3913,25 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "�vykis"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "U�uomina"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Dienotvark�"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Susitikimas"
 
@@ -3874,11 +3950,12 @@ msgid "Classification"
 msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "S_laptas"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data ir laikas"
 
@@ -3887,12 +3964,12 @@ msgid "F_ree"
 msgstr "_Laisvas"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "As_meni�kas"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Vie�as"
 
@@ -3902,7 +3979,7 @@ msgid "Show Time As"
 msgstr "Rodyti laik� kaip"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Sa_ntrauka:"
 
@@ -3914,15 +3991,20 @@ msgstr "P_abaigos laikas:"
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Organizatorius yra b�tinas."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Reikalingas bent vienas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Tas asmuo jau dalyvauja susitikime!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -3962,6 +4044,7 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -3995,34 +4078,35 @@ msgid "_Change Organizer"
 msgstr "_Keisti organizatori�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "Pakv_iesti kitus"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "Pakv_iesti kitus..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Kitas organizatorius"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "diena"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "-�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "kart�(us) pasitaikys"
 
@@ -4086,19 +4170,15 @@ msgstr "savait�(es)"
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ar nori i�saugoti pakeitimus?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Susitikimo informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "U�duoties informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "�urnalo �ra�as buvo pakeistas. Si�sti atnaujint� informacij�?"
 
@@ -4117,7 +4197,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4129,90 +4209,153 @@ msgstr "_Svarbumas:"
 msgid "_Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Apra�ymas:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "P_rad�ios data:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Slaptas"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/e-calendar-table.c:937 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "I�trinti pa�ym�tus kontaktus"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:943 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:945 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:950
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_I�trinti �i� u�duot�"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: calendar/gui/e-calendar-table.c:1217
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Spausk �ia, kad prid�tum u�duot�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4228,7 +4371,7 @@ msgid "Alarms"
 msgstr "Persp�jimai"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "U�baigta"
 
@@ -4259,8 +4402,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Ap�valga"
 
@@ -4272,105 +4415,409 @@ msgstr "U�duo�i� rikiavimas"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Eiti � dat�..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_I�trinti �� �vyk�"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "I�trinti �� _pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "I�trinti _visus pasitaikymus"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (U�baigta "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "kalendoriaus informacija"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalendorius"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "ne�inomas siunt�jas"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Pasirink veiksm�"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Gerai"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Priimtas"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Negalutinis"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Atmestas"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Nutraukti"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:868
+msgid "Meeting Information"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Susitikimas"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Susitikimas"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Ie�koti lai�ke"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "Informacija"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "buvo po"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "Atsakyti"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Nutraukti veiksm�"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalendoriaus �inut�"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "_Laisvas-u�si�m�s URL"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "_Laisvas-u�si�m�s URL"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Praeit� lai�k�"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "�iame lai�ke yra tik Bcc gav�jai."
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 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:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Negal�jau rasti nei vienos tavo asmenyb�s dalyvi� s�ra�e!\n"
 
@@ -4411,206 +4858,211 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Pirmininkaujantys asmenys"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "B�tini dalyviai"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Neb�tini dalyviai"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Ne dalyviai"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individas"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Grup�"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Resursas"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Kambarys"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Ne�inomas"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Pirmininkas"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "B�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Neb�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Pavestas"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Vykdomas"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-msgid "Chair Persons"
-msgstr "Pirmininkaujantys asmenys"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "B�tini dalyviai"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "Neb�tini dalyviai"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-msgstr "Ne dalyviai"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "N�ra informacijos"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "Pakv_iesti kitus..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Rodyti _atitraukt�"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Atnaujinti Laisvas/U�imtas"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Automati�kai parinkti"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Visi �mon�s ir resursai"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Visi �_mon�s ir vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_B�tini �mon�s"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "B�tini �mon�s ir _vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Susitikimo _prad�ios laikas:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos u�duotys i� %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, 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:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atidaromas kalendorius i� %s"
@@ -4671,231 +5123,275 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "�t"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savait� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas m�nuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "U�duotis"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_B�sena:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Svarbumas:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent� u�baigta"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorijos: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ko_ntaktai:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Spausdinti element�"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo u�duo�i� aplanko URI"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
+"OAF."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -4903,7 +5399,7 @@ msgstr ""
 "Evolution pa�m� u�duotis, kurios buvo tavo kalendoriaus aplanke ir "
 "automati�kai perk�l� jas � nauj� u�duo�i� aplank�."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -4915,125 +5411,125 @@ msgstr ""
 "Kai kurios u�duotys negal�jo b�ti perkeltos, taigi �� proces� gali b�ti "
 "bandoma pakartoti ateityje."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
-"The method required to load `%s' is not supported; no items from the calendar "
-"folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SPATKP�"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now tikisi 0 argument�"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 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:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? tikisi 0 argument�"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? tikisi 1 argumento"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? tikisi, kad pirmas argumentas bus time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Paie�kos i�rai�kos �vertinimas nedav� login�s reik�m�s"
 
@@ -5062,7 +5558,7 @@ msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5073,7 +5569,7 @@ msgstr ""
 "Tolimesni veiksmai �iame serveryje nebus i� tikro �vykdyti,\n"
 "tau v�l prisijungus prie tinklo."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5084,15 +5580,15 @@ msgstr ""
 "%s\n"
 "Pakeitimai, padaryti �iam aplankui, nebus v�l sinchronizuojami."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "V�l sinchronizuojama su serveriu"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 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:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
@@ -5118,26 +5614,26 @@ msgstr "Nes�km� ties lai�ku %d"
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
@@ -5147,30 +5643,30 @@ msgstr "Klaida vykdant filtr�: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, 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:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Perkeliami lai�kai"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5179,7 +5675,7 @@ msgstr ""
 "Negaliu i�nagrin�ti paie�kos i�rai�kos: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5188,110 +5684,110 @@ msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:639
+#: 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:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Negal�jau sukurti pipe: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Negal�jau u�rakinti '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Negal�jau sukurti %s u�rakto bylos: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Baig�si laikas, belaukiant %s u�rakto bylos. Bandyk v�liau."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Negal�jau patikrinti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Negal�jau atidaryti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nepavyko �ra�yti lai�k� � laikin� byl� %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Negal�jau sukurti pipe: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Nepavyko programa Movemail: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Ne�inoma klaida)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Klaida skaitant pa�to byl�: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Klaida �ra�ant laikin� pa�to byl�: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikin� pa�to byl�: %s"
@@ -5306,84 +5802,84 @@ msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
 msgid "Please enter your %s passphrase"
 msgstr "Pra�au �vesti tavo %s slapta�od�"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 #, 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:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 #, 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:920
+#: camel/camel-pgp-context.c:939
 #, 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:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, 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:1104
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 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:1114
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Negaliu i��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Negal�jau �kelti %s: Moduli� �k�limas �ioje sistemoje nepalaikomas."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Negal�jau �kelti %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Negal�jau �kelti %s: Modulyje n�ra inicializacijos kodo."
@@ -5403,7 +5899,7 @@ msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
@@ -5413,12 +5909,12 @@ msgid "(unknown host)"
 msgstr "(ne�inomas hostas)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netik�tai atsijung�: %s"
@@ -5476,8 +5972,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."
@@ -5511,8 +6007,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."
@@ -5525,7 +6020,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -5544,8 +6039,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Slapta�odis"
 
@@ -5574,55 +6069,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nepavyko sukompiliuoti reguliarios i�rai�kos: %s: %s"
 
-#: camel/camel-service.c:158
+#: 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:166
+#: 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:174
+#: 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:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Virtuali� aplank� pa�to tiek�jas."
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pa�to skaitymui naudojant u�klaus� i� kit� aplank� aib�s"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui �%s� n�ra tiek�jo."
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5668,17 +6163,17 @@ msgstr "Nepavyko i�koduoti lai�ko."
 msgid "Failed to verify certificates."
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, 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:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5686,7 +6181,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5701,7 +6196,7 @@ msgstr ""
 "\n"
 "Ar nori priimti vis tiek?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5720,37 +6215,37 @@ msgstr ""
 "Valstija: %s\n"
 "Valstyb�: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "N�ra tokio lai�ko: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu i�trinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu i�trinti aplanko: %s: N�ra tokio aplanko"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
@@ -5783,52 +6278,52 @@ 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:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 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:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Negal�jau atidaryti ke�o katalogo: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nepavyko i�koduoti lai�ko."
@@ -5841,7 +6336,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:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -5870,34 +6365,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:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5907,88 +6401,90 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Vietinio pa�to laikymui MH tipo pa�to kataloguose."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Vietinis pristatymas"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pa�to gavimui i� standartini� mbox formato byl�."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Pritaikyti filtrus naujiems lai�kams INBOX aplanke"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Maildir formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "Vietinio pa�to laikymui maildir kataloguose."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standartin�s Unix mbox bylos"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, 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:139
+#: camel/providers/local/camel-local-store.c:145
 #, 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:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Vietin�se saugyklose n�ra inbox"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Vietin� pa�to byla %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, 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:289
+#: camel/providers/local/camel-local-store.c:374
 #, 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:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
@@ -5999,28 +6495,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Negal�jau i�saugoti santraukos: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 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:182
+#: camel/providers/local/camel-maildir-folder.c:181
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, 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:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6029,20 +6525,20 @@ msgstr ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "N�ra tokio lai�ko"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Blogas lai�ko turinys"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6051,15 +6547,15 @@ msgstr ""
 "Negal�jau atidaryti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6068,19 +6564,19 @@ msgstr ""
 "Negal�jau sukurti aplanko: �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "�%s� n�ra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negal�jau i�trinti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
@@ -6097,34 +6593,34 @@ msgstr ""
 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:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, 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:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6133,17 +6629,17 @@ msgstr ""
 "Negaliu gauti lai�ko: %s i� aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6152,7 +6648,7 @@ msgstr ""
 "Negal�jau atidaryti bylos �%s�: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6161,14 +6657,14 @@ msgstr ""
 "Negal�jau sukurti bylos �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "�%s� n�ra paprasta byla."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6177,111 +6673,111 @@ msgstr ""
 "Negal�jau i�trinti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 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
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "�ra�omas aplankas"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Negal�jau atidaryti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Negal�jau patikrinti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Negal�jau atidaryti bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida ra�ant � laikin� pa�to d��ut�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, 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:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Negal�jau u�daryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie mh aplanko: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "�%s� n�ra katalogas."
@@ -6291,116 +6787,116 @@ 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:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, 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:116
+#: camel/providers/local/camel-spool-store.c:115
 #, 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:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "N�ra tokio aplanko �%s/%s�."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool pa�to byla %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, 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:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, 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:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nepavyko �kelti %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Pra�om �vesti NNTP slapta�od� vartotojui %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Serveris atmet� vartotojo vard�"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Nepavyko serveriui nusi�sti vartotojo vardo"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Serveris atmet� vartotojo vard�/slapta�od�"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Lai�kas %s nerastas."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Negal�jau gauti grupi� s�ra�o i� serverio."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Negaliu �kelti grupi� s�ra�o bylos d�l %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Negaliu i�saugoti grupi� s�ra�o bylos d�l %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET naujienos"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Tai tiek�jas, naudojamas skaitant ir ra�ant � USENET naujien� grupes."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Negal�jau atidaryti katalogo naujien� serveriui: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6408,116 +6904,117 @@ msgstr ""
 "Su �ia parinktimi NNTP serveryje bus autentikuojamasi paprasto teksto "
 "slapta�od�iu."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Negal�jau atidaryti ar sukurti .newsrc bylos d�l %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Parsiun�iama POP santrauka"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 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:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 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:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Sunaikinami i�trinti lai�kai"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Negal�jau parsi�sti lai�ko: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�ra lai�ko su uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Parsiun�iamas POP lai�kas %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Lai�k� saugojimas"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Palikti lai�kus serveryje"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 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:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Jungimuisi ir pa�to parsiuntimui i� POP serveri�."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 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
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
 "serveriuose, kurie teigia, jog j� palaiko."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuot�si � "
 "j�."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Negal�jau autentikuotis � KPOP server�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Negal�jau prisijungti prie serverio: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPra�om �vesti POP3 slapta�od� d�l %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6526,12 +7023,12 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Ne�inoma)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6539,7 +7036,7 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko pra�yto autentikacijos mechanizmo."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6548,196 +7045,197 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Netik�tas atsakymas i� POP serverio: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Pa�to siuntimui, perleid�iant j� vietin�s sistemos �sendmail� programai."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Negal�jau sukurti pipe � sendmail: %s: pa�tas nei�si�stas"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Negal�jau i�si�sti lai�ko: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail'as baig� darb� signalu %s: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Negal�jau paleisti %s: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail'as baig� darb� b�sena %d: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Negal�jau rasti �Nuo� adreso lai�ke"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 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:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaks�s klaida, komanda neatpa�inta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Komanda ne�gyvendinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Komandos parametras ne�gyvendintas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Sistemos b�sena, arba sistemos pagalbos atsakymas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Pagalbos �inut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Paslauga pasiruo�usi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Paslauga u�daro transmisijos kanal�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Paslauga neprieinama, u�daromas transmisijos kanalas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Pra�ytas pa�to veiksmas pavyko, u�baigtas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Pra�ytas pa�to veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Pra�ytas veiksmas nutrauktas: klaida vykdant"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Pra�ytas veiksmas ne�vykdytas: tr�ksta vietos sistemoje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Pra�ytas veiksmas ne�vykdytas: per�engta vietos saugykloje riba"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut�s vardas neleistinas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Tranzakcija nepavyko"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nepateiktas slapta�odis."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Autentikacijos mechanizmas per silpnas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pra�ytam autentikacijos mechanizmui b�tinas �ifravimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Laikina autentikacijos nes�km�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Atsakymo � pasisveikinim� klaida: %s: galb�t nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP serveris %s nepalaiko pra�yto autentikacijos tipo %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPra�om �vesti SMTP slapta�od� d�l %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6747,126 +7245,126 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pa�to siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neapibr��tas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 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:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Baig�si HELO u�klausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atsakymo klaida: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Baig�si MAIL FROM u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Baig�si RCPT TO u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Baig�si DATA siuntimo laiko riba: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA atsakymo klaida: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Baig�si QUIT u�klausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT atsakymo klaida: %s: nelemtinga"
@@ -6998,7 +7496,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Prisegti byl�"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7007,29 +7505,29 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7037,16 +7535,16 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7055,7 +7553,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7064,7 +7562,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7073,7 +7571,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7081,7 +7579,7 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7091,29 +7589,29 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�terpti byl�"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Sukurti lai�k�"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7121,7 +7619,7 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7129,11 +7627,11 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
 "jokios asmenyb�s pa�to komponente."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7181,15 +7679,24 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Prisiminti �� slapta�od�"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H:%M"
 
@@ -7240,30 +7747,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7398,7 +7905,7 @@ msgstr "Tada"
 msgid "Add action"
 msgstr "Prid�ti veiksm�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7406,16 +7913,16 @@ msgstr ""
 "Tu pamir�ai pasirinkti aplank�.\n"
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "�vesk aplanko URI"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<spausk �ia, kad pasirinktum aplank�>"
 
@@ -7432,39 +7939,39 @@ msgstr ""
 msgid "Test"
 msgstr "Bandyti"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Taisykl�s pavadinimas:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Prid�ti s�lyg�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "siun�iamas"
 
@@ -7657,7 +8164,7 @@ msgstr "Atsakytas"
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Siunt�jas"
 
@@ -7689,7 +8196,7 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Tema"
@@ -7702,15 +8209,15 @@ msgstr "buvo po"
 msgid "was before"
 msgstr "buvo prie�"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Taisykl�s"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Prid�ti taisykl�"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Keisti taisykl�"
 
@@ -7718,42 +8225,42 @@ msgstr "Keisti taisykl�"
 msgid "Score Rules"
 msgstr "�ver�io taisykl�s"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo sen� Elm pa�t�"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importuojama..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Pra�ome palaukti"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importuojama %s kaip %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Skanuojama %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:95
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Pa�tas"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7761,19 +8268,15 @@ msgstr ""
 "Evolution rado Elm pa�to byl�\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adres� knygel�"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7781,23 +8284,23 @@ msgstr ""
 "Evolution rado GnomeCard byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Skanuojamas katalogas"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7805,11 +8308,11 @@ msgstr ""
 "Evolution rado Netscape pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuoja tavo senus Pine duomenis"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7817,7 +8320,7 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -7854,68 +8357,68 @@ 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:100
 msgid "Folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuali �iuk�lin�"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtualus �iuk�lin�s aplankas"
 
-#: mail/component-factory.c:124
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Negal�jau prisijungti prie serverio: %s"
 
-#: mail/component-factory.c:142
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: mail/component-factory.c:746
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Naujas _pa�to lai�kas"
 
-#: mail/component-factory.c:933
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:948
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1113
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
@@ -7928,168 +8431,173 @@ msgstr "�%s� savyb�s"
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nauji"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d pasl�pti"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d pa�ym�ti"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d nei�si�sti"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d i�si�sti"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Sukurti vAplank� i� paie�kos"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti � aplank�..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtras pagal Konferencij�"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�p_rastas"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Gaunama informacija apie aplank�"
@@ -8184,7 +8692,7 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviej� aplank� tuo pa�iu vardu."
 
@@ -8200,52 +8708,52 @@ msgstr "I�jungti"
 msgid "Enable"
 msgstr "�jungti"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Pa�to nuostatos"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Lai�kai � %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Lai�kai nuo %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Prid�ti filtro taisykl�"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8257,7 +8765,7 @@ msgstr ""
 "gauti ir ra�yti lai�kus.\n"
 "Ar nor�tum sutvarkyti j� dabar?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8265,7 +8773,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenyb�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8273,12 +8781,12 @@ msgstr ""
 "Tu turi sutvarkyti pa�to siuntim�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei pa�to siuntimo metodo"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8286,11 +8794,11 @@ msgstr ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Si�sti vistiek?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8298,19 +8806,19 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 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:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8318,40 +8826,40 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "�iame lai�ke yra neteising� gav�j�"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 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:600
+#: mail/mail-callbacks.c:599
 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:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, 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:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8359,7 +8867,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8367,28 +8875,28 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, 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:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�sp�jimas"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8400,11 +8908,11 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Kit� kart� nebeklausti."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8413,27 +8921,27 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, 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:146
 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\" "
@@ -8469,8 +8977,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 "
@@ -8479,10 +8988,15 @@ msgstr ""
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "S�skaita"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8491,6 +9005,14 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Gauti lai�kai"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
@@ -8603,7 +9125,7 @@ msgstr "Vaizdavimas"
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Juodra��iai"
 
@@ -8750,6 +9272,7 @@ msgid "Sending Mail"
 msgstr "Pa�to siuntimas"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Si�sti lai�kai"
 
@@ -9006,23 +9529,23 @@ msgstr "Sl�pti"
 msgid "External Viewer"
 msgstr "I�orin� �i�rykl�"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
@@ -9039,30 +9562,54 @@ msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
+"jis autenti�kas"
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+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:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
+"jis autenti�kas"
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9093,11 +9640,11 @@ msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9106,29 +9653,29 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s negalima perkonfig�ruoti, nes tai n�ra vietinis aplankas"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9136,16 +9683,16 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9154,7 +9701,7 @@ msgstr ""
 "Klaida �%s� metu:\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9163,7 +9710,7 @@ msgstr ""
 "Klaida vykdant veiksm�:\n"
 "%s"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Dirbama"
 
@@ -9175,48 +9722,43 @@ msgstr "Filtruojamas aplankas"
 msgid "Fetching Mail"
 msgstr "Gaunamas pa�tas"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Ta�iau lai�kas buvo s�kmingai i�si�stas."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "U�baigta."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Negaliu kopijuoti aplanko '%s' � j� pat�"
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Perkeliama"
@@ -9230,6 +9772,11 @@ msgstr "Kopijuojama"
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+msgid "Trash"
+msgstr "�iuk�l�s"
+
 #: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
@@ -9327,74 +9874,74 @@ msgstr "V�l jungiamasi prie %s"
 msgid "_Search"
 msgstr "_Ie�koti"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Lai�kas be temos)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Lai�kas be temos"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Tu��ias lai�kas"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Ie�koti lai�ke"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Skirti raid�i� dyd�"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Ie�koti pirmyn"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Rasti:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Tinka:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Nutraukti visus"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Nutraukta."
 
@@ -9402,15 +9949,6 @@ msgstr "Nutraukta."
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr "Prisiminti �� slapta�od�"
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9420,12 +9958,12 @@ msgstr "�vesk %s slapta�od�"
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persi�stas lai�kas - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
@@ -9433,17 +9971,17 @@ msgstr "Persi�stas lai�kas"
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Kuriamas aplankas %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9456,16 +9994,20 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:723
+msgid "VFolders"
+msgstr "vAplankai"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Keisti vAplank�"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojant� vAplank� '%s'."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
@@ -9534,7 +10076,7 @@ msgstr "%a %H:%M"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Generuojamas lai�k� s�ra�as"
 
@@ -9570,16 +10112,16 @@ msgstr "U�sakomas aplankas �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%s�"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Aplankas"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
@@ -9619,89 +10161,91 @@ msgstr "_Atsisakyti"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Aplankas, kuriame yra Evolution ap�valga"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "�vykiai"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "N�ra �vyki�"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "EVRA:EETN"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 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:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Vardas:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Santraukos nuostatos"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Klaida parsiun�iant RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(N�ra apra�ymo)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Nepavyko susisiekti su or� serveriu</b></dd>"
 
@@ -9709,31 +10253,23 @@ msgstr "<dd><b>Nepavyko susisiekti su or� serveriu</b></dd>"
 msgid "Weather"
 msgstr "Orai"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "EVRA:EETN"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regionai"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y m. %B %e"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
@@ -11039,19 +11575,32 @@ msgstr "_Orai"
 msgid "The Evolution shell."
 msgstr "Evolution apvalkalas."
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Rodyti detales"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
-#: shell/e-setup.c:125
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Gauti lai�kai"
+
+#: shell/e-local-storage.c:175
+msgid "Outbox"
+msgstr "Siun�iami lai�kai"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution �diegimas"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11059,16 +11608,16 @@ msgstr ""
 "�iai naujai Evolution versijai reikia �diegti papildom� byl�\n"
 "� tavo asmenin� Evolution katalog�"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Pra�au, paspausk �Gerai�, kad �diegtum bylas, arba �At�aukti�, kad i�eitum."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11079,7 +11628,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11088,7 +11637,7 @@ msgstr ""
 "�vyko klaida kopijuojant bylas �\n"
 "'%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11099,7 +11648,7 @@ msgstr ""
 "Pra�au, perkelk j�, kad gal��iau �diegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11108,7 +11657,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11119,6 +11668,19 @@ msgstr ""
 "Evolution katalogas. Pra�au, perkelk j�, kad \n"
 "gal��iau �diegti Evolution vartotojo bylas."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Negalima aplanko perkelti � j� pat�."
@@ -11183,10 +11745,16 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplank� �%s� �:"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Pervadinti aplank�"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Nurodytas aplanko vardas yra negalimas: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11196,32 +11764,11 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Nenurodytas aplanko vardas."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Aplanko varde negali b�ti Return simbolio."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder name cannot contain the directory separator."
-msgstr "Aplanko varde negali b�ti katalog� skyriklio."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' ir '..' yra rezervuoti katalog� vardai."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Nurodytas aplanko vardas yra negalimas: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti nauj� aplank�"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11229,19 +11776,19 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "pra�yt�jam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Pasirink, kur� importer� paleisti"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11255,13 +11802,13 @@ msgstr ""
 "Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
 "susigaudyti pati."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Pra�om pasirinkti informacij�, kuri� nor�tum importuoti"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11272,7 +11819,7 @@ msgstr ""
 "Importeris nepasiruo��s.\n"
 "Laukiu 5 sekundes kol bandysiu v�l."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11281,16 +11828,16 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %s"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Tu gali importuoti tiktai � lokalius aplankus"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11299,11 +11846,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11312,17 +11859,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11331,31 +11878,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11363,39 +11910,44 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importuoti"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "U�daromos jungtys..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
+#: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr "Negal�jau inicializuoti Evolution apvalkalo."
+
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11403,11 +11955,28 @@ msgstr ""
 "Pra�om pasirinkti informacij�,\n"
 "kuri� nor�tum importuoti"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Nenurodytas aplanko vardas."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Aplanko varde negali b�ti Return simbolio."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "�iame aplanke negali b�ti lai�k�."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' ir '..' yra rezervuoti katalog� vardai."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
@@ -11441,11 +12010,15 @@ msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "_Dirbti atsijungus"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -11453,49 +12026,39 @@ msgstr "Dirbti atsijungus"
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Jokio)"
 
-#: shell/e-shell-view.c:1595
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1597
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 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:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 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:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1656
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11503,35 +12066,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1879 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "Gerai"
-
-#: shell/e-shell.c:1881
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:1887 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Grup�s pavadinimas:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11540,116 +12099,112 @@ msgstr ""
 "Ar tu tikrai nori pa�alinti grup�\n"
 "�%s� i� trumpi� juostos?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Nepa�alinti"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Pervadinti trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Pervadinti pasirinkt� trumpi� grup� �:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Pervadinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Pervadinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Pervadinti trump�"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Pervadinti pasirinkt� trump� �:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Atidaryti aplank�, susiet� su �ia trumpe"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Atidaryti naujame _lange"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, 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:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Pervadinti �i� trump�"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "I�_trinti"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Klaida i�saugant trumpes."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Trump�s"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Gauti lai�kai"
-
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11658,134 +12213,134 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Be pavadinimo)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% u�baigta)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA klaida"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Pertraukta"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Blogas argumentas"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Jau turi savinink�"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "N�ra savininko"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Nerastas"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Nepalaikomas tipas"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Nepalaikoma schema"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Nepalaikomas veiksmas"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Vidin� klaida"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Egzistuoja"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Blogas URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 #, fuzzy
 msgid "Has subfolders"
 msgstr "N�ra tokio aplanko %s"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Nebeliko vietos"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Senesnysis savininkas numir�"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -11796,7 +12351,7 @@ msgstr ""
 "\n"
 "Ne�inoma klaida."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -11809,7 +12364,7 @@ msgstr ""
 "Klaida i� komponent� sistemos yra:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -11917,90 +12472,69 @@ msgstr ""
 "Sveikas atvyk�s � Evolution importavimo priemon�.\n"
 "�is meistras pad�s tau importuojant i�orines bylas � Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importeriai"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Neimportuoti"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Kit� kart� nebeklausti"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis i� �emiau nurodyt� byl�:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution baigia darb�..."
 
-#: shell/main.c:190
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Sveiki. A�i� u� laik�, sugai�t� parsisi�sti �i� Evolution\n"
-"grupinio darbo rinkinio PER�I�ROS LAID�.\n"
-"\n"
-"Evolution dar n�ra baigta. Ji art�ja prie to, ta�iau yra viet�,\n"
-"kur ypatybi� tr�ksta arba jos tik pusiau veikia. Jei tu negali\n"
-"suprasti, kaip k� nors padaryti, tai galb�t tod�l, kad dar n�ra\n"
-"b�do tai padaryti! :-)\n"
-"\n"
-"Mes tikim�s, kad Evolution bus tinkama naudoti tau, bet vis dar\n"
-"jau�iame pareig� �sp�ti, kad ji gali: l��ti, prarasti tavo pa�t�,\n"
-"palikti veikian�ius nenaudojamus procesus, naudoti 100% CPU,\n"
-"si�sti nesiderinan�ias komandas � serverius, ir apskritai\n"
-"sug�dinti tave tavo draug� ir bendradarbi� akivaizdoje. Naudoti\n"
-"tik pagal nurodymus.\n"
-"\n"
-"Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
-"laukiame tavo prisid�jimo!\n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"A�i�\n"
-"Ximian Evolution komanda\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:344
+#: shell/main.c:289
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:387
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Klaida �keliant byl�: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Atidaryti byl�"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "�terpti byl�"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Nenurodytas aplanko vardas."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12281,11 +12815,12 @@ msgstr "Spausdinti..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "I�saugoti"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "I�saugoti ir u�daryti"
 
@@ -12301,7 +12836,7 @@ msgstr "I�saugoti �� element� � disk�"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Byla"
@@ -12323,7 +12858,7 @@ 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "I�_saugoti"
 
@@ -12386,10 +12921,6 @@ msgstr "�ra�yti susitikim� � dienotvark�"
 msgid "Customise My Evolution"
 msgstr "Prisitaikyti Mano Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Nutraukti"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Nutraukti vykdom� pa�to operacij�"
@@ -12954,7 +13485,7 @@ msgstr "U�daryti �� lang�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_U�daryti"
@@ -12982,12 +13513,13 @@ msgstr "U��ifruoti �� lai�k� su PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 #, fuzzy
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
+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
-msgid "F_ormat"
-msgstr "F_ormatas"
+#, fuzzy
+msgid "For_mat"
+msgstr "Formatas"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13038,7 +13570,7 @@ msgid "Save in folder..."
 msgstr "I�saugoti � aplank�..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "I�saugoti esam� byl�"
 
@@ -13131,7 +13663,7 @@ msgid "_From Field"
 msgstr "_Nuo laukas"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "�terpt_i"
 
@@ -13147,7 +13679,7 @@ msgstr "_Atsakyti-kam laukas"
 msgid "_Security"
 msgstr "_Saugumas"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -13383,10 +13915,6 @@ msgstr "_Trump�"
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "_Dirbti atsijungus"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Keisti ap�valgos savybes"
@@ -13458,124 +13986,124 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Apibr��ti vaizdus"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PATKP�S"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Data turi b�ti �vesta formatu: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentin� reik�m� turi b�ti tarp 0 ir 100 imtinai"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balt�"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Centrin�s Europos"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kin�"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Graik�"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japon�"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Kor�jie�i�"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turk�"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unikodas"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Vakar� Europos"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradicinis"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Supaprastintas"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainie�i�"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nauja"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ne�inoma koduot�: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "�vesk, koki� koduot� naudoti"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Kita..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Koduot�"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Paie�kos redaktorius"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
@@ -13612,11 +14140,11 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Pai_e�ka"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Ie�koti"
 
@@ -13630,18 +14158,88 @@ msgstr "Asmeninis Adres� knygel�s serveris"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): negal�jau inicializuoti GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): negal�jau inicializuoti GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#~ msgid "_Invite Others"
+#~ msgstr "Pakv_iesti kitus"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Slaptas"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Negaliu kopijuoti aplanko '%s' � j� pat�"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "EVRA:EETN"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "EVRA:EETN"
+
+#~ msgid "Folder name cannot contain the directory separator."
+#~ msgstr "Aplanko varde negali b�ti katalog� skyriklio."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Sveiki. A�i� u� laik�, sugai�t� parsisi�sti �i� Evolution\n"
+#~ "grupinio darbo rinkinio PER�I�ROS LAID�.\n"
+#~ "\n"
+#~ "Evolution dar n�ra baigta. Ji art�ja prie to, ta�iau yra viet�,\n"
+#~ "kur ypatybi� tr�ksta arba jos tik pusiau veikia. Jei tu negali\n"
+#~ "suprasti, kaip k� nors padaryti, tai galb�t tod�l, kad dar n�ra\n"
+#~ "b�do tai padaryti! :-)\n"
+#~ "\n"
+#~ "Mes tikim�s, kad Evolution bus tinkama naudoti tau, bet vis dar\n"
+#~ "jau�iame pareig� �sp�ti, kad ji gali: l��ti, prarasti tavo pa�t�,\n"
+#~ "palikti veikian�ius nenaudojamus procesus, naudoti 100% CPU,\n"
+#~ "si�sti nesiderinan�ias komandas � serverius, ir apskritai\n"
+#~ "sug�dinti tave tavo draug� ir bendradarbi� akivaizdoje. Naudoti\n"
+#~ "tik pagal nurodymus.\n"
+#~ "\n"
+#~ "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
+#~ "laukiame tavo prisid�jimo!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "A�i�\n"
+#~ "Ximian Evolution komanda\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormatas"
+
 #~ msgid "Notification about your appointment starting on %s and ending on %s"
 #~ msgstr "Prane�imas apie tavo �vyk�, prasidedant� %s ir besibaigiant� %s"
 
@@ -13672,32 +14270,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Paspausk ant ikonos, kad i��ifruotum."
 
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Kiti kontaktai"
-
-#~ msgid "Meeting Information"
-#~ msgstr "Susitikimo informacija"
-
-#~ msgid "Trash"
-#~ msgstr "�iuk�l�s"
-
-#~ msgid "VFolders"
-#~ msgstr "vAplankai"
-
-#~ msgid "Outbox"
-#~ msgstr "Siun�iami lai�kai"
-
 #~ msgid "LDAP Authentication"
 #~ msgstr "LDAP autentikacija"
 
@@ -13847,9 +14419,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Compose"
 #~ msgstr "Sukurti"
 
-#~ msgid "Task"
-#~ msgstr "U�duotis"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% u�_baigta:"
 
@@ -13913,9 +14482,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Edit Task"
 #~ msgstr "Keisti u�duot�"
 
-#~ msgid "Percent complete"
-#~ msgstr "Procent� u�baigta"
-
 #~ msgid "Mark the task complete"
 #~ msgstr "Pa�ym�ti, jog u�duotis u�baigta"
 
diff --git a/po/nn.po b/po/nn.po
index 1c2028aeee..0b9470ba60 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-10-31 01:43+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-10-31 20:17+02:00\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -575,7 +575,7 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1452
+#: calendar/conduits/calendar/calendar-conduit.c:1449
 #: calendar/conduits/todo/todo-conduit.c:1128
 #: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
@@ -646,14 +646,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1093
-#: calendar/conduits/calendar/calendar-conduit.c:984
+#: calendar/conduits/calendar/calendar-conduit.c:981
 #: calendar/conduits/todo/todo-conduit.c:692
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
 #: addressbook/conduit/address-conduit.c:1094
-#: calendar/conduits/calendar/calendar-conduit.c:985
+#: calendar/conduits/calendar/calendar-conduit.c:982
 #: calendar/conduits/todo/todo-conduit.c:693
 #, fuzzy
 msgid "Could not start wombat"
@@ -882,7 +882,7 @@ msgstr "_Legg til"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Rediger"
@@ -1057,7 +1057,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:772
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
 #: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
@@ -2687,13 +2687,13 @@ msgid "Error modifying card"
 msgstr "Feil ved lasting av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:971
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2703,7 +2703,7 @@ msgid "Repository offline"
 msgstr "depot i vcs"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -3080,6 +3080,11 @@ msgstr "Skriv ut alle"
 msgid "Print envelope"
 msgstr "Private meldingar"
 
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "&Endra avtale ..."
+
 #: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
@@ -3087,7 +3092,7 @@ msgid "High"
 msgstr "H�g"
 
 #: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
-#: calendar/gui/calendar-model.c:1700
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
@@ -3106,14 +3111,14 @@ msgstr "L�g"
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:938
+#: calendar/conduits/calendar/calendar-conduit.c:935
 #: calendar/conduits/todo/todo-conduit.c:647
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
+#: calendar/conduits/calendar/calendar-conduit.c:1075
 #: calendar/conduits/calendar/calendar-conduit.c:1078
-#: calendar/conduits/calendar/calendar-conduit.c:1081
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3272,26 +3277,26 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:438
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%1 bit %2 %3"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:441 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
 #: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%1 bit %2 %3"
@@ -3299,13 +3304,13 @@ msgstr "%1 bit %2 %3"
 #. 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:466
+#: calendar/gui/calendar-commands.c:474
 #: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 #, fuzzy
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:676
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3350,7 +3355,8 @@ msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
-#: calendar/gui/e-meeting-time-sel.c:409 shell/evolution-shell-component.c:993
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -3382,38 +3388,38 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1705
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
 #: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
 #: calendar/gui/e-meeting-model.c:776
 #, fuzzy
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
 #: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nei"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1963 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 #, fuzzy
 msgid "Searching"
@@ -3504,27 +3510,27 @@ msgstr "Oppg�ve"
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:359
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:368
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Eigenskapar for meldingsdel"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:377
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Tar-val"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:386
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:395
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
@@ -4099,38 +4105,38 @@ msgstr "Forfall"
 msgid "Could not update object!"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:671
+#: calendar/gui/dialogs/comp-editor.c:676
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/comp-editor.c:676
+#: calendar/gui/dialogs/comp-editor.c:681
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:679
+#: calendar/gui/dialogs/comp-editor.c:684
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppg�ver"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:696
+#: calendar/gui/dialogs/comp-editor.c:701
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:1054 mail/mail-callbacks.c:1876
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:1058 mail/mail-callbacks.c:1883
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 #, fuzzy
 msgid ""
@@ -4138,12 +4144,12 @@ msgid ""
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1104 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1265
+#: calendar/gui/dialogs/comp-editor.c:1270
 #, fuzzy
 msgid "Unable to obtain current version!"
 msgstr "Kan ikkje setja opp utskriftstenaren."
@@ -4304,6 +4310,10 @@ msgstr "Start-tid:"
 msgid "An organizer is required."
 msgstr ""
 
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
+
 #: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr ""
@@ -4527,7 +4537,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:966
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4709,8 +4719,8 @@ msgstr "Ein bandindeks m� vera valt i treet."
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:720
-#: camel/camel-filter-driver.c:836
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -4747,7 +4757,7 @@ msgstr "Start-dato:"
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -5340,7 +5350,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:279 widgets/misc/e-dateedit.c:1582
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr ""
 
@@ -5433,7 +5443,7 @@ msgstr "Metoden %1 er ikkje st�tta."
 msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/gnome-cal.c:1315
+#: calendar/gui/gnome-cal.c:1499
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -5441,12 +5451,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1326
+#: calendar/gui/gnome-cal.c:1510
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/gnome-cal.c:1681
+#: calendar/gui/gnome-cal.c:1865
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
@@ -5987,54 +5997,54 @@ msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 msgid "Syncing folders"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:661
+#: camel/camel-filter-driver.c:662
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:670
+#: camel/camel-filter-driver.c:671
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:685
+#: camel/camel-filter-driver.c:686
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:690
+#: camel/camel-filter-driver.c:691
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Kan ikkje dekryptera melding:"
 
-#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:920
+#: camel/camel-filter-driver.c:919
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:926
+#: camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -6103,12 +6113,12 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:109
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-lock-client.c:122
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
@@ -6116,12 +6126,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:211
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikkje starta %1."
@@ -6749,7 +6759,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mapper"
 
@@ -7935,7 +7945,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7944,67 +7954,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:886
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:908
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:937
+#: composer/e-msg-composer.c:927
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1008
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1056
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1083
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8013,13 +8023,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1194
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1345
+#: composer/e-msg-composer.c:1334
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -8029,44 +8039,44 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1352
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Vidaresendt melding fr� %1"
 
-#: composer/e-msg-composer.c:1375
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1524
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1899 composer/e-msg-composer.c:2340
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2357
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2380
+#: composer/e-msg-composer.c:2369
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:375
+#: composer/evolution-composer.c:382
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikkje initialisera lokale variablar"
@@ -8215,13 +8225,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1390 widgets/misc/e-dateedit.c:1617
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1387 widgets/misc/e-dateedit.c:1614
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
@@ -8709,7 +8719,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
@@ -9255,7 +9265,7 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -10180,76 +10190,76 @@ msgstr ""
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-post-adresse:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "&Bcc:"
 
-#: mail/mail-format.c:1821
+#: mail/mail-format.c:1799
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1822
 msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1852
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1860
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2076
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2090
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2095
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2132
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2137
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -10301,7 +10311,7 @@ msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -10310,7 +10320,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -10319,7 +10329,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
@@ -10846,31 +10856,41 @@ msgstr "%H:%M"
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:423
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:467
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:918
+#: my-evolution/e-summary-preferences.c:946
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppf�ring"
 
-#: my-evolution/e-summary-preferences.c:926
+#: my-evolution/e-summary-preferences.c:954
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet p� gruppa du vil leggja til."
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:958
 #, fuzzy
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1476
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Sp�rjinga inneheld"
@@ -10912,14 +10932,6 @@ msgstr ""
 msgid "Weather"
 msgstr "Vatn"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS"
-msgstr ""
-
 #: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Omr�der"
@@ -12784,6 +12796,29 @@ msgid ""
 "that you would like to import"
 msgstr ""
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "G� til side"
+
+#: shell/e-shell-utils.c:121
+#, fuzzy
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
@@ -12848,26 +12883,26 @@ msgstr "Flyttar"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1592
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1594
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(ingen)"
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1648
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -13128,70 +13163,70 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 #, fuzzy
 msgid "CORBA error"
 msgstr "IU-feil"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 #, fuzzy
 msgid "Invalid argument"
 msgstr "(ugyldig)"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 #, fuzzy
 msgid "No owner"
 msgstr "Ingen"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Ust�tta operasjon"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 #, fuzzy
 msgid "No space left"
 msgstr "Ingen rektangel valt!"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr ""
 
@@ -13350,49 +13385,26 @@ msgstr "Bruk p� f�lgjande delar:"
 msgid "Evolution is now exiting ..."
 msgstr "Skriftinnstillingar"
 
-#: shell/main.c:193
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:268
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:347
+#: shell/main.c:289
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:390
+#: shell/main.c:332
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
@@ -13750,6 +13762,7 @@ msgid "Save"
 msgstr "Lagre"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save and Close"
 msgstr "Lagra ei fil"
@@ -13767,7 +13780,7 @@ msgstr "Lagra til disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fil"
@@ -13790,7 +13803,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -14530,7 +14543,7 @@ msgstr "&Slett avtale"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Lukk"
@@ -14564,8 +14577,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
 #, fuzzy
@@ -14622,7 +14636,7 @@ msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Lagre gjeldande fil"
 
@@ -14728,7 +14742,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Set _inn"
 
@@ -14745,7 +14759,7 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -15302,6 +15316,9 @@ msgstr "Kunne ikkje initiere Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
 #, fuzzy
 #~ msgid "_Invite Others"
 #~ msgstr "Andre ..."
@@ -15378,12 +15395,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "seriell"
 
 #, fuzzy
-#~ msgid "Folder cannot contain the directory separator."
-#~ msgstr ""
-#~ "Kan ikkje laga heimekatalog\n"
-#~ "Feil: %1"
-
-#, fuzzy
 #~ msgid "Ximian Evolution"
 #~ msgstr "Evolution"
 
diff --git a/po/no.po b/po/no.po
index 189219111c..430ac584c4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-10-26 00:15+0200\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-26 00:21+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -29,291 +29,296 @@ msgstr "Factory for import av VCard-filer til Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer til Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prim�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Pri"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Buss"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Datamaskin"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Faks p� arbeid"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Faks i buss"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Buss 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Persons�ker"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Avdeling"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Avd"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Av"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Mann"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "FBUrl"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Br.dag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "F�dselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -321,7 +326,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -329,7 +334,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -337,7 +342,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -345,7 +350,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -353,7 +358,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -361,7 +366,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -369,7 +374,7 @@ msgstr ""
 "\n"
 "F�dselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -377,7 +382,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -385,7 +390,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -393,7 +398,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -401,7 +406,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -409,7 +414,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -417,7 +422,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -425,7 +430,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -433,7 +438,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -441,7 +446,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -449,7 +454,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -457,7 +462,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -465,7 +470,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -473,7 +478,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -481,7 +486,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -489,7 +494,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -497,7 +502,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -505,7 +510,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -513,7 +518,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -521,7 +526,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -529,7 +534,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -537,7 +542,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -545,7 +550,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -553,7 +558,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -561,7 +566,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -579,7 +584,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -587,7 +592,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -595,11 +600,11 @@ msgstr ""
 "\n"
 "Offentlig n�kkel: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -608,18 +613,18 @@ msgstr "VCard 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:1433
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1091
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "S�ker..."
 
@@ -632,60 +637,60 @@ msgstr "Laster..."
 msgid "Error in search expression."
 msgstr "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Kobler til LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Kunne ikke koble til IMAP-tjener."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Venter p� tilkobling til LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort p� LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Mottar s�keresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Starter s�k p� nytt."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�ren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:662
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:663
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -729,39 +734,39 @@ msgstr "Factory for adressebokens adressevisning"
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Mappe some inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener some inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Ny _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Ny kontakt_liste"
 
@@ -794,7 +799,7 @@ msgid "Base"
 msgstr "Basis"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -889,7 +894,7 @@ msgstr "_Legg til"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "R_ediger"
@@ -907,19 +912,19 @@ msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:169
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �pne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -929,7 +934,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -941,7 +946,7 @@ msgstr ""
 "m� du kompilere programmet fra kildekoden i CVS etter �\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -949,42 +954,42 @@ msgstr ""
 "Kunne ikke �pne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til � aksessere den."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avansert..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -997,51 +1002,51 @@ msgstr "URIen som mappeutforskeren vil vise"
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Velg en handling"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opprett en ny kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Legg til adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Kj�rer sp�rring i adressebok..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Deaktiver sp�rringer"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiver sp�rringer (Farlig!)"
 
@@ -1053,35 +1058,35 @@ msgstr "Evolution adressebok-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Send HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Rediger kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Kontaktliste uten navn"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d ikke vist)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
@@ -1101,7 +1106,15 @@ msgstr ""
 "vennligst send en melding til Jon Trowbridge <trow@ximian.com> med en\n"
 "detaljert beskrivelse av omstendighetene rundt feilen. Takk."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
@@ -1161,12 +1174,12 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1236,10 +1249,10 @@ msgstr "_Kontakter..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1307,46 +1320,46 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten h�rer til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Rediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2413,7 +2426,7 @@ msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -2462,13 +2475,13 @@ msgstr ""
 "Den nye e-post adressen eller navnet for denne kontakten\n"
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Avansert s�k"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "S�k"
 
@@ -2487,9 +2500,9 @@ msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
@@ -2500,18 +2513,18 @@ msgid "Open"
 msgstr "�pne"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2519,94 +2532,99 @@ msgid "Print"
 msgstr "Skriv ut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Suksess"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1889
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Lager \"offline\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Kort ikke funnet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke st�ttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:484 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Vil du lagre endringene?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Feil under tillegg av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Feil ved tillegg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2614,84 +2632,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for � legge til en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Arbeidsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Annen adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "og %d andre kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "og et annet kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2877,58 +2895,63 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "R_ediger avtale"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "H�y"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:410 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:617
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:725
-#: calendar/conduits/todo/todo-conduit.c:728
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
@@ -2984,23 +3007,23 @@ msgstr "Alarm-tjeneste"
 msgid "Factory for the alarm notification service"
 msgstr "Factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Starter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:219
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm p� %s"
@@ -3022,11 +3045,11 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3038,7 +3061,7 @@ msgstr ""
 "� sende e-post. Evolution vil vise en vanlig dialog\n"
 "for p�minnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3054,114 +3077,115 @@ msgstr ""
 "        %s\n"
 "Er du sikker p� at du �nsker � kj�re dette programmet?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Kunne ikke opprette meldingstjeneste for alarm"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:460
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:461
-#: calendar/gui/e-meeting-time-sel.c:410 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Opptatt"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:482
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:483 calendar/gui/e-meeting-model.c:316
-#: calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Fullf�rt"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3172,54 +3196,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:300
-#: calendar/gui/e-meeting-model.c:721
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nei"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "S�ker"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Arbeidsukevisning"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Ukevisning"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "M�nedsvisning"
 
@@ -3239,44 +3263,44 @@ msgstr "Kommentar inneholder"
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Mappe som inneholder avtaler og hendelser"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:246 my-evolution/e-summary-tasks.c:262
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Mappe som inneholder oppgaver"
 
-#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/component-factory.c:650
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -3348,110 +3372,110 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dager"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d uker"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 uke"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-page.c:378
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Vis en melding"
 
-#: calendar/gui/dialogs/alarm-page.c:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Kj�r et program"
 
-#: calendar/gui/dialogs/alarm-page.c:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utf�res"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s f�r avtalen starter"
 
-#: calendar/gui/dialogs/alarm-page.c:407
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s f�r avtalen slutter"
 
-#: calendar/gui/dialogs/alarm-page.c:424
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: calendar/gui/dialogs/alarm-page.c:429
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utl�sertype"
@@ -3472,7 +3496,7 @@ msgstr "P�minnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:683 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3555,7 +3579,7 @@ msgid "First day of wee_k:"
 msgstr "F�rste dag i u_ken:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3568,7 +3592,7 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Mandag"
 
@@ -3577,7 +3601,7 @@ msgid "O_verdue tasks:"
 msgstr "Utg�tte oppga_ver:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "L�rdag"
 
@@ -3598,7 +3622,7 @@ msgid "Su_n"
 msgstr "S�_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -3615,7 +3639,7 @@ msgid "Tas_ks due today:"
 msgstr "Opp_gaver som g�r ut i dag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3636,12 +3660,12 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -3710,121 +3734,121 @@ msgstr "_Ons"
 msgid "before the start of the appointment"
 msgstr "f�r avtalen starter"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "M�testatus er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker p� at du vil avlyse og slette dette m�tet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker p� at du vil avlyse og slette denne oppgaven?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker p� at du vil avlyse og slette denne journaloppf�ringen?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppf�ringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppf�ringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Fullf�rt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Fullf�rt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:304
+#: calendar/gui/dialogs/comp-editor.c:303
 msgid "Could not update object!"
 msgstr "Kunne ikke oppdatere objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:635
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:640
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:643
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:646
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:660
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:1014 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3833,53 +3857,53 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1232
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker p� at du vil slette avtalen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker p� at du vil slette denne avtalen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker p� at du vil slette oppgaven `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker p� at du vil slette denne oppgaven uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker p� at du vil slette journaloppf�ringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil slette denne journaloppf�ringen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker p� at du vil slette %d avtaler?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker p� at du vil slette %d oppgaver?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker p� at du vil slette %d journaloppf�ringer?"
@@ -3896,25 +3920,25 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "P�minnelse"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "M�teplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "M�te"
 
@@ -3933,11 +3957,12 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Kon_fidensiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Dato & klokke"
 
@@ -3946,12 +3971,12 @@ msgid "F_ree"
 msgstr "L_edig"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
@@ -3961,7 +3986,7 @@ msgid "Show Time As"
 msgstr "Vis tid som"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
@@ -3973,15 +3998,20 @@ msgstr "S_lutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Minst en deltaker kreves"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette m�tet!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4021,6 +4051,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4054,35 +4085,36 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Inviter andre"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Inviter andre..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "Annen _organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "gjentakelser"
 
@@ -4146,19 +4178,15 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "�r"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringene?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "M�teinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Journaloppf�ringen er endret. Send en oppdatert versjon?"
 
@@ -4177,7 +4205,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4189,145 +4217,154 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:937 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Slett valgte kontakter"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_�pne"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Merk som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "Sle_tt denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Merk oppgaver som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1217
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+#, fuzzy
+msgid "Updating objects"
+msgstr "Oppdatering i sekunder:"
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for � legge til en oppgave"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4343,7 +4380,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Fullf�rt"
 
@@ -4374,8 +4411,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:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4387,113 +4424,118 @@ msgstr "Oppgavesortering"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "Sle_tt denne avtalen"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Gj�r denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-itip-control.c:473
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "M�te starter: <b>"
 
-#: calendar/gui/e-itip-control.c:478
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "Oppgave starter: <b>"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Ledig/opptatt-informasjon starter: <b>"
 
-#: calendar/gui/e-itip-control.c:487
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Starter: <b>"
 
-#: calendar/gui/e-itip-control.c:500
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "M�te slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:503
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Ledig/opptatt-informasjon slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:519
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "Oppgave fullf�rt: <b>"
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "Oppgave ferdig: <b>"
 
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "_Kalenderinformasjon:"
+
 #. Title
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:644 calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4501,221 +4543,273 @@ msgstr ""
 "<br>Vennligst sjekk f�lgende informasjon og velg s� en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:683
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Velg en handling"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Oppdater:"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Godtatt"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Tentativ "
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Avsl�tt"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Ledig/opptatt-informasjon"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Oppgaveinformasjon"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "M�teinformasjon"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> foresp�r din tilstedev�relse i et m�te."
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "M�teforslag"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �nsker � legge til informasjon i et eksisterende m�te."
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �nsker � motta seneste m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Foresp�rsel om m�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart p� en m�teforesp�rsel."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et m�te."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "M�teavlysing"
 
-#: calendar/gui/e-itip-control.c:755 calendar/gui/e-itip-control.c:803
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforst�elig melding."
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�temelding"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> foresp�r at du utf�rer en oppgave."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Foresp�rsel om oppgave"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �nsker � legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �nsker � motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Foresp�rsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart p� en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Svar p� oppgave"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Avlysing av oppgave"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> foresp�r din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt foresp�rsel"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart p� en foresp�rsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til � v�re riktig utformet"
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder foresp�rsler som ikke er st�ttet."
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Oppdatering fullf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppf�ringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke fjerne oppf�ringen fra din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Fjerning fullf�rt"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Oppf�ring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Oppf�ringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Kunne ikke finne noen av dine indentiteter i deltakerlisten!\n"
 
@@ -4756,216 +4850,211 @@ msgstr "slutt-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520 calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Styremedlemmer"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Obligatoriske deltakere"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Valgfrie deltakere"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Ikke-deltakere"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
-#: calendar/gui/e-meeting-model.c:691
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:692
-#: calendar/gui/e-meeting-model.c:708
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
-#: calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522 calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:707
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
-#: calendar/gui/e-meeting-model.c:735
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Avsl�tt"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-model.c:736 calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
-#: calendar/gui/e-meeting-model.c:737
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-msgid "Chair Persons"
-msgstr "Styremedlemmer"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "Obligatoriske deltakere"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "Valgfrie deltakere"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-msgstr "Ikke-deltakere"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "_Inviter andre..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Oppdater fri/ledig"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Tid for m�tets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Tid for m�tets slutt:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�pner oppgaver p� %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � laste `%s' er ikke st�ttet"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �pne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � �pne `%s' er ikke st�ttet"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�pner kalender p� %s"
@@ -5026,235 +5115,273 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "En organisator m� oppgis."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i hendelsen."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke opprette factory for komponentredigering"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "S�n"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "L�r"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Valgt m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Valgt �r (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Oppgave"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Status:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritet:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Prosent fullf�rt"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorier: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ko_ntakter:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Forh�ndsvisning av utskrift"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Skriv ut oppf�ring"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control-factory.c:76
+#: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Kunne ikke opprette oppgavevisning. Vennligst sjekk din ORBit og OAF konfigurasjon."
+msgstr ""
+"Kunne ikke opprette oppgavevisning. Vennligst sjekk din ORBit og OAF "
+"konfigurasjon."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5262,7 +5389,7 @@ msgstr ""
 "Evolution har utf�rt automatisk migrasjon av oppgavene fra din kalendermappe "
 "til den nye oppgaver-mappen."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5274,7 +5401,7 @@ msgstr ""
 "Noen av oppgavene kunne ikke migreres, s� denne prosessen vil kunne fors�kes "
 "igjen i fremtiden."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5283,7 +5410,7 @@ msgstr ""
 "Kunne ikke �pne `%s'; ingen oppf�ringer fra kalendermappen vil flyttes til "
 "oppgavemappen."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5292,83 +5419,83 @@ msgstr ""
 "Metoden som kreves for � laste `%s' er ikke st�ttet; ingen oppf�ringer fra "
 "kalendermappen vil bli migrert til oppgavemappen."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "tid-n� forventer 0 argumenter"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "lag-tid forventer 1 argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "lag-tid forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "argument 1 til make-time m� v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "tid-add-day forventer 2 argumenter"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day forventer at argument 2 er et heltall"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 1 argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 1 argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end forventer at argument 1 er av type time_t"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? forventer at argument 1 er av type time_t"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range forventer at argument 2 er av type time_t"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "inneholder? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5376,11 +5503,11 @@ msgstr ""
 "contains? forventer at argument 1 er en av \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer minst 1 argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5388,19 +5515,19 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller ett, og kun "
 "ett, argument er den bolske verdien falsk (#f)"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 1 argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av s�keuttrykket ga ikke en boolsk verdi"
 
@@ -5424,7 +5551,7 @@ msgstr "Kryptering er ikke st�ttet av dette cipheret"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke st�ttet av dette cipheret"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5435,7 +5562,7 @@ msgstr ""
 "Videre operasjoner p� denne tjeneren vil ikke kunne spilles av n�r\n"
 "du kobler til dette nettverket igjen."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5446,15 +5573,15 @@ msgstr ""
 "%s\n"
 "Endringer i denne mappen vil ikke resynkroniseres."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med tjener"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Du m� arbeide tilknyttet for � fullf�re denne operasjonen"
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
@@ -5480,26 +5607,26 @@ msgstr "Feilet p� melding %d"
 msgid "Cannot open message"
 msgstr "Kan ikke �pne melding"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet p� melding %d av %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kj�ring av filter: %s: %s"
@@ -5509,26 +5636,26 @@ msgstr "Feil under kj�ring av filter: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filters�k: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ust�ttet operasjon: legg til melding: for %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ust�ttet operasjon: s�k etter uttrykk: etter %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Ust�ttet operasjon: s�k p� uid: etter %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5537,7 +5664,7 @@ msgstr ""
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5546,110 +5673,110 @@ msgstr ""
 "Feil under kj�ring av s�keuttrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utf�rer sp�rring p� ukjent header: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i kropp-inneholder, forventer streng"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikke r�r for l�shjelper: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan ikke kj�re fork for l�shjelper: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Kunne ikke l�se '%s': protokollfeil med l�shjelper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke l�se '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke opprette l�sfil for %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsavbrudd under venting p� l�sfil for %s. Pr�v igjen senere."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Feil under l�sing ved bruk av fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under l�sing ved bruk av flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke �pne postfil %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke �pne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette r�r: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kj�re fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Feil under lesing av postfil: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Feil under skriving av midlertidig fil: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
@@ -5664,86 +5791,86 @@ msgstr "Vennligst skriv inn din %s passphrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst � signere"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan ikke signere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke signere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst for \"clearsign\""
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan ikke verifisere denne meldingen: ingen tekst � verifisere"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke verifisere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %"
 "s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
 "s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke kryptere denne meldingen: ingen tekst � kryptere"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke kryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst � dekryptere"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke dekryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %"
 "s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunne ikke laste %s: Modullasting er ikke st�ttet p� dette systemet."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
@@ -5763,7 +5890,7 @@ msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
@@ -5773,12 +5900,12 @@ msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -5890,7 +6017,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar p� autentisering fra tjener."
 
@@ -5907,8 +6034,8 @@ msgid "Unknown authentication state."
 msgstr "Ukjent autentiseringstilstand."
 
 #: 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Passord"
 
@@ -5938,55 +6065,55 @@ msgstr "POP f�r SMTP autentisering via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regul�rt uttrykk feilet: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' m� inneholde et brukernavn"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' m� inneholde et vertsnavn"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' m� inneholde en sti"
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: \"%s\""
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i navneoppslag: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Vertsoppslag feilet: %s: ukjent �rsak"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en sp�rring p� et annet sett med mapper"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6032,15 +6159,15 @@ msgstr "Feil under dekoding av melding."
 msgid "Failed to verify certificates."
 msgstr "Feil under verifisering av sertifikater."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6050,7 +6177,7 @@ msgstr ""
 "Emne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6065,7 +6192,7 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6084,37 +6211,37 @@ msgstr ""
 "Stat: %s\n"
 "Land: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn p� mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn p� mappe: %s: Ingen slik mappe"
@@ -6147,52 +6274,52 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble �delagt og laget p� nytt p� tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "S�ker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "S�ker etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Kan ikke �pne cache-katalog: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Feil under mellomlagring av melding %s: %s"
@@ -6205,7 +6332,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mapper"
 
@@ -6239,28 +6366,28 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved � bruke et klartekst-"
 "passord."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6271,88 +6398,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke � ha undermapper"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lokale levering"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "For henting av lokal e-post fra standard \"spools\" i mbox format"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Bruk filtre for nye meldinger i INNBOKS"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "E-postkataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring av lokal e-post i maildir-kataloger."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standard Unix mbox \"spools\""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "For lesing og lagring av lokal e-post i standard mbox \"spool\"-filer."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrot %s er ikke en vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn p� mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -6363,27 +6492,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke lagre sammendrag: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Operasjon for � legge til melding i maildir avbrutt"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6392,20 +6521,20 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6414,15 +6543,15 @@ msgstr ""
 "Kan ikke �pne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6431,19 +6560,19 @@ msgstr ""
 "Kunne ikke opprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
@@ -6458,33 +6587,33 @@ msgstr "Kunne ikke s�ke i mappe `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke �pne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappel�s p�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �pne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Opreasjon for � legge til e-post avbrutt"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6493,17 +6622,17 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til � ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6512,7 +6641,7 @@ msgstr ""
 "Kunne ikke �pne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6521,14 +6650,14 @@ msgstr ""
 "Kunne ikke opprette fil `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6537,110 +6666,110 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "MAppen `%s' er ikke tom. Ikke slettet."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke �pne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen n�r posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �pne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �pne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Operasjon for � legge til melding for MH avbrutt"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke en katalog."
@@ -6650,49 +6779,49 @@ msgstr "`%s' er ikke en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke �pne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Kan ikke legge til melding i spool-filen: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool `%s' eksisterer ikke eller er ikke en vanlig fil"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke v�re gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke v�re slettes"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6701,69 +6830,69 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan v�re korrupt, kopi lagret i `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunne ikke lagre: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Tjeneren godtok ikke brukernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Feil under sending av brukernavn til tjener"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtok ikke brukernavn/passord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Melding %s ikke funnet"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra tjeneren."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kunne ikke laste gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dette er en tilbyder for lesing av og posting av innlegg til USENET "
 "nyhetsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunne ikke �pne katalog for news-tjener: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6771,71 +6900,71 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke �pne eller opprette .newsrc-fil for %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikke sjekke POP-tjener etter nye meldinger: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunne ikke �pne mappe: meldingslisten var ikke komplett."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunne ikke hente melding: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente melding fra POP-tjener %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen melding med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Meldingslager"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Behold meldinger p� tjeneren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Slett etter %s dag(er)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For tilkobling til og nedhenting av e-post p� POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6844,7 +6973,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er st�ttet av mange POP-"
 "tjenere."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6854,34 +6983,34 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv p� tjenere som hevder � st�tte det."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lar deg koble til POP-tjeneren ved � bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunne ikke koble til tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener p� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6890,12 +7019,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6903,7 +7032,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen st�tte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6912,22 +7041,22 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Uventet svar fra POP-tjener: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6935,172 +7064,172 @@ msgstr ""
 "For levering av e-post ved � videresende den til \"sendmail\"-programmet p� "
 "det lokale systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke opprette r�r til sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kj�re fork p� sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende meldingen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avsluttet med signal %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke kj�re %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avsluttet med status %d: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Kunne ikke finne 'Fra'-adresse i melding"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar p� systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullf�rt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst pr�v <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utf�rt: utilstrekkelig lagringsplass"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utf�rt: postboksnavn ikke tillatt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Passordoverf�ring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7111,126 +7240,126 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-foresp�rsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rsel feilet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"MAIL FROM\"-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Feil ved \"MAIL FROM\"-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"RCPT TO\"-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-foresp�rsel: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-foresp�rsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -7362,7 +7491,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7371,29 +7500,29 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7401,16 +7530,16 @@ msgstr ""
 "Kunne ikke �pne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7419,7 +7548,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7428,7 +7557,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7437,7 +7566,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7445,7 +7574,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du pr�ve � gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7455,23 +7584,23 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�pne fil"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7479,7 +7608,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke � aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7487,7 +7616,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke � aktivere HTML-redigeringskomponenten."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7495,11 +7624,11 @@ msgstr ""
 "Kunne ikke opprette skrivevindu fordi du ikke har satt\n"
 "opp en identitet i e-post-komponenten."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:84
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7548,23 +7677,23 @@ msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
 #. Remember the password?
-#: e-util/e-passwords.c:348 mail/mail-session.c:258
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: e-util/e-passwords.c:350 mail/mail-session.c:259
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk dette passordet for resten av denne sesjonen"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H:%M"
 
@@ -7615,30 +7744,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7774,7 +7903,7 @@ msgstr "S�"
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7782,16 +7911,16 @@ msgstr ""
 "Du glemte � velge en mappe.\n"
 "Vennligst g� tilbake og spesifiser en gyldig mappe for levering av e-post."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Skriv inn URI for mappen"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<klikk her for � velge en mappe>"
 
@@ -7808,39 +7937,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Utf�r handlinger"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�tt"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�tt"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "innkommende"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "utg�ende"
 
@@ -8033,7 +8162,7 @@ msgstr "Svart til"
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Avsender"
 
@@ -8065,7 +8194,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
@@ -8078,15 +8207,15 @@ msgstr "var etter"
 msgid "was before"
 msgstr "var f�r"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -8094,42 +8223,42 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du m� spesifisere minst en mappe som kilde."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "S�ker i %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:97
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8137,19 +8266,15 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeKort:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8157,23 +8282,23 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ker i katalog"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8181,11 +8306,11 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8193,7 +8318,7 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8229,40 +8354,40 @@ msgstr "Factory for e-post sammendrag komponent."
 msgid "Mail configuration interface"
 msgstr "Grensesnitt for e-post-konfigurasjon"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mappe som inneholder e-post"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Mappe for meldingslager (intern)"
 
-#: mail/component-factory.c:99
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell s�ppel"
 
-#: mail/component-factory.c:99
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuelle s�ppelmappe"
 
-#: mail/component-factory.c:126
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Kunne ikke koble til lager: %s"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:750
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8270,27 +8395,27 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til � v�re korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:918
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:918
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Ny e-post _melding"
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1122
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
@@ -8303,164 +8428,164 @@ msgstr "Egenskaper for \"%s\""
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Lag vFolder fra s�k"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VFolder p� e-post_liste"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtrer p� em_ne"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtrer p� sen_der"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtrer p� motta_ker"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtrer p� e-_postliste"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Merk som uv_iktig"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Legg til sender i adressebok"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Lage rege_l fra melding"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtrer etter e-postliste"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VFolder p� e-postliste"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrer etter e-postliste (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder p� e-postliste (%s)"
@@ -8563,7 +8688,7 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
@@ -8579,52 +8704,52 @@ msgstr "Deaktiver"
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Ikke slett"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Innstillinger for e-post"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8636,7 +8761,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den n�?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8644,7 +8769,7 @@ msgstr ""
 "Du m� konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8652,12 +8777,12 @@ msgstr ""
 "Du m� konfigurere en e-post-transport\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8665,11 +8790,11 @@ msgstr ""
 "Du sender en melding i HMTL-format, men f�lgende mottakeres �nsker ikke � "
 "motta meldinger i HTML-format:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8677,7 +8802,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8685,11 +8810,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til � skjule listens "
 "adresser vil denne meldingen kunn inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8699,40 +8824,40 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Denne meldingen inneholder ugyldige mottakere:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakere for � kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Du m� konfigurere en konto f�r du kan sender denne meldingen."
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8740,7 +8865,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8748,28 +8873,28 @@ msgstr ""
 "Du kan kun sende meldinger p� nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d meldingene p� nytt?"
 
-#: mail/mail-callbacks.c:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8781,11 +8906,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Ikke sp�r meg igjen."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8794,19 +8919,19 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �pne alle %d meldingene i separate vinduer?"
@@ -8863,7 +8988,7 @@ msgstr ""
 "under. Dette navnet blir kun brukt for visning p� skjermen."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -9003,7 +9128,7 @@ msgstr "Vis"
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Skisser"
 
@@ -9149,7 +9274,7 @@ msgid "Sending Mail"
 msgstr "Utg�ende e-post"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Sendt"
 
@@ -9397,23 +9522,23 @@ msgstr "Skjul"
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "�pne lenke i nettleser"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
@@ -9430,27 +9555,27 @@ msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -9501,11 +9626,11 @@ msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9514,28 +9639,28 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne �pne denne mappen igjen: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke lagre metainformasjon om mappe p�: %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s kan kanskje ikke konfigureres p� nytt fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9543,16 +9668,16 @@ msgstr ""
 "Hvis du ikke kan �pne denne postboksen igjen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke endre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s p� nytt"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9561,7 +9686,7 @@ msgstr ""
 "Feil under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9570,7 +9695,7 @@ msgstr ""
 "Feil under utf�ring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Arbeider"
 
@@ -9582,48 +9707,43 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Likevel, fullf�rte sending av meldingen."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet p� melding %d av %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Fullf�rt."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Kan ikke kopiere en mappe `%s' til seg selv"
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Flytter"
@@ -9638,7 +9758,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "S�ppel"
 
@@ -9739,35 +9859,35 @@ msgstr "Kobler til %s p� nytt"
 msgid "_Search"
 msgstr "_S�k"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Melding uten tittel)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Melding uten tittel"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Tom melding"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Skill mellom store/sm� bokstaver"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "S�k fremover"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Treff:"
 
@@ -9823,30 +9943,30 @@ msgstr "Skriv inn passord for %s"
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp vmappe: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Oppdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9859,20 +9979,20 @@ msgstr ""
 "    '%s'\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:637
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ver � redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
@@ -9941,7 +10061,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -9977,16 +10097,16 @@ msgstr "Abonnerer p� mappe \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
@@ -10026,88 +10146,90 @@ msgstr "_Fjern abonnement"
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-komponent for sammendrag."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som inneholder Evolution sammendrag"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Avtaler"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Ingen avtaler"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l: %M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Navn:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Innstillinger for sammendrag"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Feil under nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
-#: my-evolution/e-summary-tasks.c:247
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Ingen oppgaver"
 
-#: my-evolution/e-summary-tasks.c:286
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Min v�rmelding"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>V�r-tjeneren kunne ikke kontaktes</b></dd>"
 
@@ -10115,31 +10237,23 @@ msgstr "<dd><b>V�r-tjeneren kunne ikke kontaktes</b></dd>"
 msgid "Weather"
 msgstr "V�r"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "KBOS:EGAA:RJTT"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regioner"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
@@ -11442,31 +11556,31 @@ msgstr "_V�r"
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Alys operasjon"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:637
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11474,17 +11588,17 @@ msgstr ""
 "Denne nye versjonen av Evolution m� installere tilleggsfiler i\n"
 "din personlige Evolution-katalog"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Vennligst klikk \"OK\" for � installere filene, eller \"Avbryt\" for � "
 "avslutte."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11495,7 +11609,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11504,7 +11618,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11515,7 +11629,7 @@ msgstr ""
 "Venligst flytt denne for � tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11529,7 +11643,7 @@ msgstr ""
 "kan kj�re.\n"
 "Vil du fjerne denne katalogen?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11540,15 +11654,15 @@ msgstr ""
 "Evolution-katalogen. Venligst flytt den for � \n"
 "tillate installasjon av Evolution's brukerfiler."
 
-#: shell/e-shell-about-box.c:41
+#: shell/e-shell-about-box.c:40
 msgid "Evolution "
 msgstr "Evolution "
 
-#: shell/e-shell-about-box.c:42
+#: shell/e-shell-about-box.c:41
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-about-box.c:44
+#: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
 
@@ -11616,10 +11730,16 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn p� mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Endre navn p� mappe"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Spesifisert mappenavn er ikke gyldig: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11629,32 +11749,11 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Ingen mappenavn spesifisert."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappenavn kan ikke inneholde linjeskift."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Mappenavn kan ikke inneholde katalogseparator."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' og '..' er reserverte mappenavn."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Spesifisert mappenavn er ikke gyldig: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Lag ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11662,19 +11761,19 @@ msgstr ""
 "Typen for valgt mappe er ikke gyldig for den\n"
 "forespurte operasjonen."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:143
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Velg type importerer som skal kj�res"
 
-#: shell/e-shell-importer.c:146
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11688,13 +11787,13 @@ msgstr ""
 "Du kan velge \"Automatisk\" hvis du ikke vet, s� vil Evolution pr�ve � finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:152
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Vennligst velg informasjon du �nsker � importere"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11705,7 +11804,7 @@ msgstr ""
 "Importerer ikke klar.\n"
 "Venter 5 sekunder f�r nytt fors�k."
 
-#: shell/e-shell-importer.c:264 shell/e-shell-importer.c:295
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11714,16 +11813,16 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring %d."
 
-#: shell/e-shell-importer.c:398
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:410
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Du kan kun importere til lokale mapper"
 
-#: shell/e-shell-importer.c:425
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11732,11 +11831,11 @@ msgstr ""
 "Ingen importerer som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:443
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11745,17 +11844,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11764,31 +11863,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring 1."
 
-#: shell/e-shell-importer.c:562
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:618
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:653
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importer data og innstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:657
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:722 shell/e-shell-startup-wizard.c:577
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11796,11 +11895,11 @@ msgstr ""
 "Vennligst vent...\n"
 "S�ker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:725 shell/e-shell-startup-wizard.c:580
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:701
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -11813,15 +11912,15 @@ msgstr "Velg mappe"
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en m�lmappe for � importere data"
 
-#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-startup-wizard.c:160
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
@@ -11830,11 +11929,11 @@ msgstr ""
 "Kunne ikke starte assistent-grensesnittet for Evolution\n"
 "(%s)"
 
-#: shell/e-shell-startup-wizard.c:170
+#: shell/e-shell-startup-wizard.c:169
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte assistent-grensesnittet for Evolution\n"
 
-#: shell/e-shell-startup-wizard.c:743
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11842,11 +11941,28 @@ msgstr ""
 "Vennligst velg informasjonen\n"
 "du �nsker � importere"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Ingen mappenavn spesifisert."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Mappenavn kan ikke inneholde linjeskift."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Denne mappen kan ikke inneholde meldinger."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' og '..' er reserverte mappenavn."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kj�res."
 
@@ -11862,7 +11978,7 @@ msgstr "G� til mappe..."
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du �nsker � �pne"
 
-#: shell/e-shell-view-menu.c:530 ui/evolution.xml.h:10
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Opprett en ny snarvei"
 
@@ -11881,11 +11997,15 @@ msgid "Error executing %s."
 msgstr "Feil under kj�ring av %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Arbeid \"online\""
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:33
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Ar_beid \"offline\""
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
@@ -11893,49 +12013,39 @@ msgstr "Arbeid \"offline\""
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1595
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1597
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klikk p� denne knappen for � arbeide "
 "frakoblet."
 
-#: shell/e-shell-view.c:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i ferd med � koble fra."
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klikk p� denne knappen for � arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1656
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11946,35 +12056,31 @@ msgstr ""
 "har avsluttet uventet. Du vil m�tte avslutte Evolution og starte p�\n"
 "nytt for � f� tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:1879 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1881
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1887 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11983,111 +12089,111 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Endre navn p� snarveigruppen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Endre valgt snarveigruppe til:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "E_ndre navn p� denne gruppen..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Endre navn p� denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Endre navn p� snarvei"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Endre navn p� valgt snarvei til:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "�pne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "�pne i nytt _vindu"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "�pne mappen som er lenket til denne snarveien i et nytt vindu"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Endre navn p� denne snarveien"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12096,133 +12202,133 @@ msgstr ""
 "Kan ikke overf�re mappe:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til � opprette mappen"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke st�ttet"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke st�ttet for dette lageret"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Spesifisert mappe kan ikke endres eller fjernes"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke gj�re en mappe til barn av en av sine etterkommere"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Kunne ikke opprette en mappe med det navnet"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullf�rt)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Har allerede en eier"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Ingen eier"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Ust�ttet type"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Ust�ttet schema"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Ust�ttet operasjon"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Ingen plass igjen"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Gammel eier er d�d"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12233,7 +12339,7 @@ msgstr ""
 "\n"
 "Ukjent feil."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12246,7 +12352,7 @@ msgstr ""
 "Feilen fra komponentsystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12355,82 +12461,44 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Ikke importer"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Ikke sp�r meg igjen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
-#: shell/main.c:90
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutter n�..."
 
-#: shell/main.c:194
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hei. Takk for at du har tatt deg tid til � laste ned denne pr�veversjonen\n"
-"av Ximian Evolution gruppevarepakken.\n"
-"\n"
-"Ximian Evolution er ikke ferdig. Det n�rmer seg, men deler av "
-"funksjonaliteten\n"
-"mangler eller er ikke fullf�rt.\n"
-"\n"
-"Hvis du finner feil, vennligst rapporter dem til bugzilla.ximian.com.\n"
-"Dette produktet gir deg ingen garanti og er ikke ment for\n"
-"individer som har lett for voldsomme sinneutbrudd.\n"
-"\n"
-"Vi h�per at du nyter resultatene av v�rt harde arbeid, og vi venter i\n"
-"spenning p� at du tilbyr din hjelp!\n"
-
-#: shell/main.c:215
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Takk\n"
-"Ximian Evolution utviklerene\n"
-
-#: shell/main.c:269
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:278
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:348
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:349
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feils�kingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:391
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -12712,7 +12780,7 @@ msgid "Delete this item"
 msgstr "Slett denne oppf�ringen"
 
 #: 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 "Hovedverkt�ylinje"
 
@@ -12730,11 +12798,12 @@ msgstr "Skriv ut..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Lagre"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -12750,8 +12819,8 @@ msgstr "Lagre denne oppf�ringen til disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fil"
 
@@ -12772,7 +12841,7 @@ msgstr "Lagre kontakten og lukk dialogboksen"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -12832,10 +12901,6 @@ msgstr "Sett opp m�te for denne oppf�ringen"
 msgid "Customise My Evolution"
 msgstr "Tilpass min Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
@@ -13017,7 +13082,7 @@ msgstr "Meldingsliste med tr�der"
 msgid "_Expunge"
 msgstr "_T�m"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -13389,7 +13454,7 @@ msgstr "_Normal visning"
 msgid "_Open Message"
 msgstr "_�pne melding"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:53
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Verkt�y"
@@ -13400,13 +13465,13 @@ msgstr "Lukk dette vinduet"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vis"
 
@@ -13431,8 +13496,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13483,7 +13549,7 @@ msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
@@ -13576,7 +13642,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Sett _inn"
 
@@ -13592,7 +13658,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -13704,146 +13770,130 @@ msgstr "Lag en lenke til denne mappen p� snarveilinjen"
 msgid "Create a new folder"
 msgstr "Opprett en ny mappe"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "Slett denne mappen"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Evolution _Window"
 msgstr "Evolution vindu"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "Flytt denne mappen til et annet sted"
 
-#: ui/evolution.xml.h:19
-msgid "Open a new Evolution window"
-msgstr "�pne et nytt Evolution vindu"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Open in New Window"
 msgstr "�pne i nytt vindu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr "�pne denne mappen i et annet vindu"
 
-#: ui/evolution.xml.h:23
-msgid "Settings for the Pilot"
-msgstr "Innstillinger for Pilot"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "Bytt"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� av/p� visning av mappelinjen"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� av/p� visning av snarveilinjen"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "Skift til \"offline\" arbeidsmodus."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: ui/evolution.xml.h:34
-msgid "Work in offline mode"
-msgstr "Arbeid frakoblet"
-
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:31
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OBS"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:41
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:45
 msgid "_Pilot Settings..."
 msgstr "Innstillinger for _pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:55
-msgid "_Work Offline"
-msgstr "Ar_beid \"offline\""
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Endre innstilingene for sammendrag"
@@ -13928,114 +13978,114 @@ msgstr "Definer visninger"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "n�"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "I dag"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen m� skrives inn p� formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien m� v�re mellom 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Ny"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -14072,38 +14122,111 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "S�_k"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Finn n� "
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Personlig adressebok-tjener"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebok-tjener; factory"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunne ikke initiere GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "_Invite Others"
+#~ msgstr "_Inviter andre"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Konfidensiell"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeKort:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Kan ikke kopiere en mappe `%s' til seg selv"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "KBOS:ZSAM:EGAA"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "KBOS:EGAA:RJTT"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Mappenavn kan ikke inneholde katalogseparator."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hei. Takk for at du har tatt deg tid til � laste ned denne "
+#~ "pr�veversjonen\n"
+#~ "av Ximian Evolution gruppevarepakken.\n"
+#~ "\n"
+#~ "Ximian Evolution er ikke ferdig. Det n�rmer seg, men deler av "
+#~ "funksjonaliteten\n"
+#~ "mangler eller er ikke fullf�rt.\n"
+#~ "\n"
+#~ "Hvis du finner feil, vennligst rapporter dem til bugzilla.ximian.com.\n"
+#~ "Dette produktet gir deg ingen garanti og er ikke ment for\n"
+#~ "individer som har lett for voldsomme sinneutbrudd.\n"
+#~ "\n"
+#~ "Vi h�per at du nyter resultatene av v�rt harde arbeid, og vi venter i\n"
+#~ "spenning p� at du tilbyr din hjelp!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Takk\n"
+#~ "Ximian Evolution utviklerene\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
+
+#~ msgid "Open a new Evolution window"
+#~ msgstr "�pne et nytt Evolution vindu"
+
+#~ msgid "Settings for the Pilot"
+#~ msgstr "Innstillinger for Pilot"
+
+#~ msgid "Work in offline mode"
+#~ msgstr "Arbeid frakoblet"
+
 #~ msgid "Alarm on %A %b %d %Y %H:%M"
 #~ msgstr "Alarm p� %A %b %d %Y %H:%M"
 
@@ -14231,9 +14354,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Debug"
 #~ msgstr "_Feils�k"
 
-#~ msgid "_Calendar Information:"
-#~ msgstr "_Kalenderinformasjon:"
-
 #~ msgid "_Free/Busy Information:"
 #~ msgstr "_Ledig/opptatt-informasjon"
 
@@ -14325,9 +14445,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d.%m.%Y"
 
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "There was an error downloading news feed"
 #~ msgstr "Det oppsto en feil under lasting av nyhetene"
 
@@ -14762,9 +14879,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "Delegert fra:"
 
-#~ msgid "Task"
-#~ msgstr "Oppgave"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% ferdi_g:"
 
@@ -15054,9 +15168,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Notification about your journal entry"
 #~ msgstr "Melding om din journaloppf�ring"
 
-#~ msgid "Percent complete"
-#~ msgstr "Prosent fullf�rt"
-
 #~ msgid "Elm Aliases"
 #~ msgstr "Elm alias"
 
@@ -15549,9 +15660,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Mount point:"
 #~ msgstr "Monteringspunkt:"
 
-#~ msgid "Update in seconds:"
-#~ msgstr "Oppdatering i sekunder:"
-
 #~ msgid "Icon:"
 #~ msgstr "Ikon:"
 
@@ -16032,9 +16140,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Location:"
 #~ msgstr "Plassering:"
 
-#~ msgid "Update:"
-#~ msgstr "Oppdater:"
-
 #~ msgid "Conditions:"
 #~ msgstr "Forhold:"
 
@@ -17607,9 +17712,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Add to Calendar"
 #~ msgstr "Legg til i kalenderen"
 
-#~ msgid " Tentative "
-#~ msgstr " Tentativ "
-
 #~ msgid "Update Calendar"
 #~ msgstr "Oppdater kalender"
 
diff --git a/po/pl.po b/po/pl.po
index a35c019303..399f43cebe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-31 11:27+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-31 11:28+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Factory to import LDIF files into Evolution."
 msgstr "Generator importu plik�w z LDIF do Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
 msgid "Imports LDIF files into Evolution."
 msgstr "Importuje pliki LDIF do Evolution."
 
@@ -29,300 +29,300 @@ msgstr "Importuje pliki LDIF do Evolution."
 msgid "Factory to import VCard files into Evolution."
 msgstr "Generator importu plik�w z VCard do Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
 msgid "Imports VCard files into Evolution."
 msgstr "Importuje pliki VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Nazwa karty"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nazwa"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "G��wny"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "G�wn"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Asystent"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Praca"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Prc"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Frma"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Przeno�ny"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Samoch�d"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Faks s�u�b"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Praca 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Prc 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Dom 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Serwis WWW"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Oddzia�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Oddz"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Bro"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Tytu�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Zaw�d"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Zawd"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Menad�er"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Mnd�"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asyst"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Przydomek"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Przyd"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Ma��onek"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Notka"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI kalendarza"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "URIKal"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL sygnalizuj�cy zaj�to��"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "UrlZaj"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Rocznica"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Roczn"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Data urodzenia"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorie"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Nazwisko panie�skie"
 
-#: addressbook/backend/ebook/e-card-simple.c:1
+#: addressbook/backend/ebook/e-card-simple.c:787
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -330,7 +330,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -338,7 +338,7 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -346,7 +346,7 @@ msgstr ""
 "\n"
 "  Imi�:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -354,7 +354,7 @@ msgstr ""
 "\n"
 "  Dodatkowe:  "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -362,7 +362,7 @@ msgstr ""
 "\n"
 "  Rodzina:    "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -370,7 +370,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -378,7 +378,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -386,7 +386,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -394,7 +394,7 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -402,7 +402,7 @@ msgstr ""
 "\n"
 "  Rozszerzony: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -410,7 +410,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -418,7 +418,7 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -426,7 +426,7 @@ msgstr ""
 "\n"
 "  Region:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -434,7 +434,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -442,7 +442,7 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -450,7 +450,7 @@ msgstr ""
 "\n"
 "Etykieta pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -458,7 +458,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -466,7 +466,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -474,7 +474,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -482,7 +482,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -490,7 +490,7 @@ msgstr ""
 "\n"
 "Dostarczyciel poczty: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -498,7 +498,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -506,7 +506,7 @@ msgstr ""
 "\n"
 "Po�o�enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -514,7 +514,7 @@ msgstr ""
 "\n"
 "Stanowisko s�u�bowe: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -522,7 +522,7 @@ msgstr ""
 "\n"
 "Organizacja: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -530,7 +530,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -538,7 +538,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -546,7 +546,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -554,7 +554,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -562,7 +562,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -570,7 +570,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -588,7 +588,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -596,7 +596,7 @@ msgstr ""
 "\n"
 "Unikatowy napis: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -604,97 +604,97 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycj� %s"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:1
-#: addressbook/backend/ebook/load-pine-addressbook.c:1
-#: addressbook/backend/ebook/test-client-list.c:1
-#: addressbook/backend/ebook/test-client.c:1
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
-#: tools/evolution-addressbook-export.c:1
-#: tools/evolution-addressbook-import.c:1
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:1
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: addressbook/backend/pas/pas-backend-file.c:1
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:1
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "B��d w wyra�eniu wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Nawi�zywanie po��czenia z serwerem LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Oczekiwanie na po��czenie z serwerem LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Ponowne rozpoczynanie wyszukiwania."
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Nie mo�na wczyta� kursora\n"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "Nie mo�na wczyta� EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Nie mo�na uruchomi� serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Nie mo�na uruchomi� wombata"
 
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 
@@ -702,82 +702,82 @@ msgstr "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 msgid "A Bonobo control for an address popup."
 msgstr "Komponent Bonobo wyskakuj�cego okna z adresem."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr "Komponent Bonobo wy�wietlaj�cy adres."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Przyk�adowy komponent Bonobo wy�wietlaj�cy ksi��k� adresow�."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Komponent Bonobo wy�wietlaj�cy miniaturow� kart� ksi��ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obs�uguj�cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Generator komponent�w miniatorowych kart ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Generator komponent�w wy�wietlaj�cych adres z ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 "Generator komponent�w wy�wietlaj�cych wyskakuj�ce okno z adresem z ksi��ki "
 "adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the sample Addressbook control"
 msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-component.c:1
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/dialogs/comp-editor-util.c:1 shell/e-local-storage.c:1
-#: shell/e-shortcuts.c:1
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/component/addressbook-component.c:526
+#: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Nowy _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:1
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Nowa _lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Edit Addressbook"
 msgstr "Ustawienia ksi��ki adresowej"
 
@@ -785,74 +785,74 @@ msgstr "Ustawienia ksi��ki adresowej"
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Account Name"
 msgstr "Nazwa konta"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Add Addressbook"
 msgstr "Dodanie ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Podstawa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Proste"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "_Usu�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution wykorzysta ten adres e-mail przy uwierzytelnianiu na serwerze"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
 msgstr "Pojedyncze"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Search _base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Search s_cope: "
 msgstr "_Zakres wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "Server Name"
 msgstr "Nazwa serwera"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "Sub"
 msgstr "Podrz�dne"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "W celu dodania ksi��ki adresowej potrzebne s� poni�sze informacje."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid "This information is not required for most ldap servers. "
 msgstr "W przypadku wi�kszo�ci serwer�w LDAP te informacje nie s� potrzebne."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -861,7 +861,7 @@ msgstr ""
 "wykorzystywanych w wyszukiwaniu. Aby uzysta� wi�cej informacji, skontaktuj "
 "si� z administratorem systemu."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -869,15 +869,15 @@ msgstr ""
 "To jest w�ze� bazowy dla wszystkich wyszukiwa� na serwerze LDAP. Aby uzysta� "
 "wi�cej informacji, skontaktuj si� z administratorem systemu."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid "This is the name of the server where your addressbook is located."
 msgstr "To jest nazwa serwera, na kt�rym zlokalizowana jest ksi��ka adresowa."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "This is the port that your ldap server uses."
 msgstr "To jest numer portu, wykorzystywanego przez serwer LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:22
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -885,54 +885,54 @@ msgstr ""
 "Ta nazwa b�dzie wykorzystywana do identyfikacji konta. Jest ona przeznaczona "
 "tylko do wy�wietlania."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:23
 msgid "_Account name:"
 msgstr "Nazwa _konta:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1 my-evolution/my-evolution.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#: 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:21
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
+#: 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:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_My server requires authentication"
 msgstr "_Serwer wymaga uwierzytelnienia"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:27
 msgid "_Port:"
 msgstr "P_ort:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:28
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:1
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -941,7 +941,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "wprowadzeniem niepoprawnego URI lub niedost�pno�ci� serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -952,7 +952,7 @@ msgstr ""
 "Aby m�c wykorzysta� LDAP, nale�y pobra� OpenLDAP spod podanego\n"
 "poni�ej adresu i ponownie skompilowa� Evolution ze �r�de�.\n"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -960,42 +960,42 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Upewnij si�, �e �cie�ka\n"
 "ustnieje oraz �e ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Wprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:760
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:763
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:1 widgets/misc/e-filter-bar.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1
-#: calendar/gui/cal-search-bar.c:1
+#: addressbook/gui/component/addressbook.c:1005
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
@@ -1004,55 +1004,55 @@ msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * card.
 #.
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:178
 msgid "(none)"
 msgstr "(brak)"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Wyb�r czynno�ci"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Stw�rz nowy kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniej�cego kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Sprawdzanie ksi��ki adresowej..."
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Zmie� informacje o kontakcie"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Dodaj do kontakt�w"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Do��czenie adresu e-mail"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Wy��cz zapytania"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "W��cz zapytania (Niebezpieczne!)"
 
@@ -1060,43 +1060,43 @@ msgstr "W��cz zapytania (Niebezpieczne!)"
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
-#: addressbook/gui/component/select-names/e-select-names.c:1
-#: composer/e-msg-composer-attachment-bar.c:1 filter/filter-filter.c:1
-#: filter/filter-rule.c:1 shell/e-shortcuts-view.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Usu�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Usu� wszystko"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Wys�anie listu jako HTML"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Zmodyfikuj list� kontakt�w"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Lista kontakt�w bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d niewy�wietlonych)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1106,14 +1106,13 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "Nie mo�na uzyska� lokalnego miejsca przechowywania ksi��ki adresowej.\n"
-"Mo�e to by� spowodowane nieprawid�owym dzia�aniem "
-"komponentuevolution-addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu "
-"tego\n"
+"Mo�e to by� spowodowane nieprawid�owym dzia�aniem komponentuevolution-"
+"addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu tego\n"
 "problemu, wy�lij e-mail (w j�zyku angielskim) do Jona Trowbridge'a\n"
 "<trow@ximian.com>, szczeg�owo opisuj�c warunki, w jakich pojawi� si�\n"
 "problem. Dzi�kujemy."
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:532
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1125,7 +1124,7 @@ msgstr ""
 "Aby naprawi� ten problem, konieczne mo�e by� zako�czenie, a\n"
 "nast�pnie ponowne uruchomienie Evolution."
 
-#: addressbook/gui/component/select-names/e-select-names.c:1
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
 
@@ -1133,31 +1132,31 @@ msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
 msgid "C_ontaining:"
 msgstr "Z_awieraj�cy:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Co_ntacts:"
 msgstr "K_ontakty:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "F_ind"
 msgstr "_Znajd�:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
 msgstr "Wyb�r nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show contacts matching the following criteria:"
 msgstr "Wy�wietlenie kontakt�w, odpowiadaj�cych nast�puj�cym kryteriom:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Message Recipients:"
 msgstr "Odbiorcy _listu:"
 
@@ -1165,48 +1164,48 @@ msgstr "Odbiorcy _listu:"
 msgid "Anni_versary:"
 msgstr "_Rocznica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Pra_ca"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Faks s�u�bowy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorie..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Collaboration"
 msgstr "Wsp�praca"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Edytor kontakt�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Szczeg�y"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "F_ree/Busy URL:"
 msgstr "URL sygnalizuj�cy zaj�to��:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "N_azwa karty:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Og�lne"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: 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"
@@ -1216,106 +1215,106 @@ msgstr ""
 "informacje kalendarza, podaj tutaj adres\n"
 "tych informacji."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "_Organizacja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Typy telefon�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Chce otrzymywa� listy w HTML-u"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "Adre_s..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Praca"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: 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 "_Kontakty..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.c:1 filter/filter.glade.h:1
-#: mail/folder-browser.c:1 mail/mail-config.glade.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/evolution.xml.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Oddzia�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "Pe�na _nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Dom"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "Tytu� s�u�_bowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nazwisko _szefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "P_rzeno�ny"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "Z_aw�d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "URL publicznego _kalendarza:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Ma��onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_To jest adres pocztowy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
@@ -1327,50 +1326,50 @@ msgstr ""
 "Czy na pewno chcesz\n"
 "usun�� ten kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Usun�� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynale�y do nast�puj�cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaku"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Pe�na edycja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Pe�na nazwa"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -1383,966 +1382,966 @@ msgstr ""
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Algeria"
 msgstr "Algieria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "American Samoa"
 msgstr "Samoa Ameryka�ska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "Antarctica"
 msgstr "Antarktyka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "Argentina"
 msgstr "Argentyna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
 msgstr "Azerbejd�an"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
 msgid "Belarus"
 msgstr "Bia�ogu�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
 msgid "Bolivia"
 msgstr "Boliwia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
 msgid "Bosnia And Herzegowina"
 msgstr "Bo�nia i Hercegowina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
 msgid "Bouvet Island"
 msgstr "Wyspa Bouveta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
 msgstr "Brytyjskie Terytorium Oceanu Spokojnego"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
 msgid "British Virgin Islands"
 msgstr "Brytyjskie Wyspy Dziewicze"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
 msgid "Brunei Darussalam"
 msgstr "Su�tanat Brunei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
 msgid "Bulgaria"
 msgstr "Bu�garia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
 msgid "Cape Verde"
 msgstr "Wyspy Zielonego Przyl�dka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
 msgid "Cayman Islands"
 msgstr "Kajmany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
 msgid "Central African Republic"
 msgstr "Republika �rodkowej Afryki"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
 msgid "Chad"
 msgstr "Czad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Sprawd� adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
 msgid "China"
 msgstr "Chiny"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
 msgid "Christmas Island"
 msgstr "Wyspa Bo�ego Narodzenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
 msgid "Cocos (Keeling) Islands"
 msgstr "Wyspy Kokosowe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
 msgid "Colombia"
 msgstr "Columbia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
 msgid "Comoros"
 msgstr "Komory"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
 msgid "Congo"
 msgstr "Kongo"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
 msgid "Cyprus"
 msgstr "Cypr"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
 msgid "Czech Republic"
 msgstr "Republika Czeska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
 msgid "Denmark"
 msgstr "Dania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
 msgid "Djibouti"
 msgstr "D�ibuti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
 msgid "Dominican Republic"
 msgstr "Republika Dominikany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
 msgid "East Timor"
 msgstr "Wschodni Timor"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
 msgid "Ecuador"
 msgstr "Ekwador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
 msgid "Egypt"
 msgstr "Egipt"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
 msgid "El Salvador"
 msgstr "Salwador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
 msgid "Equatorial Guinea"
 msgstr "Gwinea R�wnikowa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
 msgid "Falkland Islands"
 msgstr "Falklandy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
 msgid "Faroe Islands"
 msgstr "Wyspy Faroe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
 msgid "France"
 msgstr "Francja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
 msgid "French Guiana"
 msgstr "Gujana Francuska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
 msgid "French Southern Territories"
 msgstr "Francuskie terytoria po�udniowe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
 msgid "Germany"
 msgstr "Niemcy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
 msgid "Greece"
 msgstr "Grecja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
 msgid "Guinea-bissau"
 msgstr "Gwinea Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
 msgid "Guyana"
 msgstr "Gujana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
 msgid "Heard And McDonald Islands"
 msgstr "Wyspy Headra i McDonalda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
 msgid "Holy See"
 msgstr "Watykan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
 msgid "Honduras"
 msgstr "Hinduras"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
 msgid "Hungary"
 msgstr "W�gry"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
 msgid "India"
 msgstr "Indie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
 msgid "Israel"
 msgstr "Izrael"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
 msgid "Italy"
 msgstr "W�ochy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
 msgid "Japan"
 msgstr "Japonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
 msgid "Latvia"
 msgstr "Litwa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
 msgid "Lebanon"
 msgstr "Libia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
 msgid "Lithuania"
 msgstr "�otwa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
 msgid "Macau"
 msgstr "Makao"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
 msgid "Maldives"
 msgstr "Mo�dawia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
 msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
 msgid "Martinique"
 msgstr "Martynika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
 msgid "Mayotte"
 msgstr "Majotta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
 msgstr "Antyle holenderskie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
 msgid "Norfolk Island"
 msgstr "Wyspa Norfolk"
 
 # [cyba] S� Mariany, wi�c p�nocne pewnie te�...
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
 msgid "Northern Mariana Islands"
 msgstr "P�nocne Mariany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
 msgid "Norway"
 msgstr "Norwegia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
 msgid "Palestinian Territory"
 msgstr "Autonomia Palesty�ska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
 msgid "Papua New Guinea"
 msgstr "Papua Nowa Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
 msgid "Paraguay"
 msgstr "Paragwaj"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
 msgid "Poland"
 msgstr "Polska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
 msgid "Republic Of Korea"
 msgstr "Republika Korei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
 msgid "Republic Of Moldova"
 msgstr "Republika Mo�dawii"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
 msgid "Romania"
 msgstr "Rumunia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
 msgid "Russian Federation"
 msgstr "Federacja rosyjska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts i Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent i Grenadyny"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
 msgid "San Marino"
 msgstr "San Marino"
 
 # [cyba] Tak jest w moim atlasie, drugiej cz�ci nie ma
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
 msgid "Seychelles"
 msgstr "Szeszele"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
 msgid "Slovakia"
 msgstr "S�owacja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
 msgid "Slovenia"
 msgstr "S�owenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
 msgid "South Africa"
 msgstr "Po�udniowa Afryka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Po�udniowa Georgia i Sandwich Po�udniowy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Helena"
 msgstr "�wi�ta Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre i Miquelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Wyspy Svalbard i Jan Mayen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
 msgid "Swaziland"
 msgstr "Suazi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
 msgid "Tajikistan"
 msgstr "Tad�ykistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
 msgid "Trinidad And Tobago"
 msgstr "Trynidad i Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
 msgid "Turkey"
 msgstr "Turcja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Caicos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
 msgid "U.S. Virgin Islands"
 msgstr "Ameryka�skie Wyspy Dziewicze"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
 msgid "Uganda"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
 msgid "United Kingdom"
 msgstr "Zjednoczone Kr�lestwo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
 msgid "United Republic Of Tanzania"
 msgstr "Zjednoczona REpublika Tanzanii"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "United States Minor Outlying Islands"
 msgstr "Oddalone drobne wyspy Stan�w Zjednoczonych"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
 msgid "Viet Nam"
 msgstr "Wietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
 msgid "Wallis And Futuna Islands"
 msgstr "Wyspy Wallis i Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
 msgid "Western Sahara"
 msgstr "Zachodnia Sachara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
 msgid "Yugoslavia"
 msgstr "Jugos�awia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_PO Box:"
 msgstr "Sk_rzynka pocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:241
 msgid "_ZIP Code:"
 msgstr "K_od pocztowy:"
 
@@ -2350,68 +2349,68 @@ msgstr "K_od pocztowy:"
 msgid "Check Full Name"
 msgstr "Pe�na nazwa"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr"
 
 # Nie ma odpowiednika tego w j�zyku polskim (wypada�oby mie� pusty napis, ale ten ^$#& gettext...)
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr " "
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Pan"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Pani"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Imi�:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nazwisko:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Drugie:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tytu�:"
 
@@ -2419,29 +2418,29 @@ msgstr "_Tytu�:"
 msgid "List _name:"
 msgstr "Nazwa _listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 msgid "Members"
 msgstr "Cz�onkowie"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Wprowad� adres e-mail lub przeci�gnij kontakt do poni�szej listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ukrywanie adres�w przy wysy�aniu do tej listy"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "contact-list-editor"
 msgstr "Edytor listy kontakt�w"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:1
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Edytor listy kontakt�w"
 
@@ -2449,20 +2448,20 @@ msgstr "Edytor listy kontakt�w"
 msgid "Add Anyway"
 msgstr "Dodaj mimo tego"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "Wykryto powt�rzony kontakt"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "Nowy Kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "Oryginalny kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2474,15 +2473,15 @@ msgstr ""
 msgid "Change Anyway"
 msgstr "Zmie� mimo tego"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Zmieniony kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "Koliduj�cy kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2490,156 +2489,156 @@ msgstr ""
 "Folder zawiera ju� kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy pomimo tego chcesz go doda�?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: widgets/misc/e-filter-bar.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search.c:1
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "liczba kart: 1"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:1
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr "liczba kart: %d"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otw�rz"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prze�lij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: 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:66
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1 filter/libfilter-i18n.h:1
-#: mail/mail-accounts.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Usu�"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-minicard.c:1
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "B��d przy modyfikacji karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Sukces"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: camel/providers/imap/camel-imap-command.c:1 shell/e-shell.c:1
-#: shell/e-storage.c:1 shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1 shell/e-storage.c:1
-#: shell/evolution-shell-component.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Karta z tym ID ju� istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
-#: camel/camel-service.c:1 camel/camel-service.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Anulowane"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: calendar/gui/dialogs/save-comp.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisa� zmiany?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "B��d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
 #. 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:1
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,a,�,b,c,�,d,e,�,f,g,h,i,j,k,l,�,m,n,�,o,�,p,q,r,s,�,t,u,v,w,x,y,z,�,�"
@@ -2648,85 +2647,85 @@ msgstr ""
 #. 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:1
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,a,�,b,c,�,d,e,�,f,g,h,i,j,k,l,�,m,n,�,o,�,p,q,r,s,�,t,u,v,w,x,y,z,�,�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij, aby doda� kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "G��wny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Telefon s�u�bowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Telefon callbacka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Telefon przeno�ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Telefon s�u�bowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "oraz %d innych kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "oraz jedna inna karta."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi��ce adresowej"
 
-#: addressbook/gui/widgets/e-minicard-view.c:1
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2740,7 +2739,7 @@ msgstr ""
 "\n"
 "Dwukrotne klikni�cie stworzy nowy kontakt."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:1
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Widok karty"
 
@@ -2748,222 +2747,227 @@ msgstr "Widok karty"
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Pustych formatek na ko�cu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Tre��"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Dolny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "G��wka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "G��wka/Stopka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Nag��wki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Nag��wek dla ka�dej litery"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Wysoko��:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Bezpo�rednio jedna po drugiej"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Do��czanie:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Pejza�"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Lewy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Zak�adki liter z boku"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marginesy"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opcje"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "U�o�enie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Strona"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "�r�d�o papieru:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portret"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Podgl�d:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Drukowanie przy u�yciu odcieni szaro�ci"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Odwrotnie na stronach parzystych"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Prawy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Cieniowanie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Rozpoczynana na nowej stronie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "G�rny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Szeroko��:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Wydrukuj karty"
 
-#: addressbook/printing/e-contact-print.c:1
-#: addressbook/printing/e-contact-print.c:1
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Wydrukuj kart�"
 
-#: addressbook/printing/e-contact-print-envelope.c:1
-#: addressbook/printing/e-contact-print-envelope.c:1
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Wydrukuj kopert�"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Zmodyfikuj termin"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Wysoki"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Zwyk�y"
 
-#: calendar/cal-util/cal-util.c:1 calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Niski"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/cal-util/cal-util.c:515
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "B��d przy komunikacji z serwerem kalendarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji kalendarza pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 
@@ -2971,43 +2975,43 @@ msgstr "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 msgid "A Bonobo control which displays a task list."
 msgstr "Komponent Bonobo wy�wietlaj�cy list� zada�."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Komponent Bonobo wy�wietlaj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Komponent zestawienia wykonawczego kalendarza Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Generator komponentu zestawienia kalendarza."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Generator formantu zada� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Generator formantu wy�wietlania iTip kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Generator przyk�adowego formantu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Generator tworz�cy generator komponentu edytora"
 
@@ -3015,27 +3019,27 @@ msgstr "Generator tworz�cy generator komponentu edytora"
 msgid "Alarm notification service"
 msgstr "Us�uga przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 msgid "Factory for the alarm notification service"
 msgstr "Generator us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Pocz�tek:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm o %s"
@@ -3045,23 +3049,23 @@ msgstr "Alarm o %s"
 msgid "C_lose"
 msgstr "Zam_knij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
 msgstr "_U�pij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Czas u�pienia (minuty)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3073,7 +3077,7 @@ msgstr ""
 "z powiadamianiem za po�rednictwem list�w. Zamiast tego\n"
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3090,114 +3094,114 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomi� ten program?"
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nie mo�na zainicjowa� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Nie mo�na stworzy� us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie mo�na stworzy� generatora us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:1 calendar/gui/e-day-view-top-item.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
-#: calendar/gui/calendar-commands.c:1 calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na stworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-meeting-time-sel.c:1
-#: shell/evolution-shell-component.c:1
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/print.c:1
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3208,131 +3212,131 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
-#: mail/mail-config.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:1
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nie"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Widok dnia"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Widok tygodnia roboczego"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Widok tygodnia"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:1
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:1 mail/mail-ops.c:1
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
-#: calendar/gui/component-factory.c:1 my-evolution/my-evolution.glade.h:1
-#: shell/e-local-storage.c:1 shell/e-shortcuts.c:1
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Folder zawieraj�cy terminy i zdarzenia"
 
-#: calendar/gui/component-factory.c:1 calendar/gui/print.c:1
-#: my-evolution/e-summary-tasks.c:1 my-evolution/e-summary-tasks.c:1
-#: shell/e-local-storage.c:1 shell/e-shortcuts.c:1
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Zadania"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/component-factory.c:1 calendar/gui/e-day-view.c:1
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/component-factory.c:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/component-factory.c:1
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Nowe _zadanie"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI wy�wietlany przez kalendarz"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu d�wi�kowego"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Ustawienia alarmu z wys�aniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
@@ -3340,23 +3344,23 @@ msgstr "Ustawienia nieznanego alarmu"
 msgid "Alarm Repeat"
 msgstr "Powt�rzenia alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Message to Display"
 msgstr "Wy�wietlany komunikat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Play sound:"
 msgstr "Odtwarzany d�wi�k:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Repeat the alarm"
 msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Run program:"
 msgstr "Uruchamiany program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: 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."
@@ -3364,185 +3368,185 @@ msgstr ""
 "To jest przypomnienie za pomoc� listu, lecz Evolution nie obs�uguje jeszcze "
 "tego typu przypomnie�, wi�c modyfikacja jego opcji nie b�dzie mo�liwa."
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "extra times every"
 msgstr "dodatkowych razy co"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 tydzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Odtworzenie d�wi�ku"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Wy�wietlenie komunikatu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Wys�anie listu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Uruchomienie programu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Wykonanie nieznanej czynno�ci"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s przed pocz�tkiem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po pocz�tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na pocz�tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s przed ko�cem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po ko�cu terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na ko�cu terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Opcje..."
 
 #. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/libfilter-i18n.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/libfilter-i18n.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "przed"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1 mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "pocz�tek terminu"
 
@@ -3550,317 +3554,317 @@ msgstr "pocz�tek terminu"
 msgid "05 minutes"
 msgstr "05 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Calendar and Tasks Settings"
 msgstr "Ustawienia kalendarza i zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr "Kolor zaleg�ych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Create new appointments with a default _reminder"
 msgstr "Tworzenie nowych termin�w z domy�lnym p_rzypomnieniem"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "First day of wee_k:"
 msgstr "Pierwszy dzie� _tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "O_verdue tasks:"
 msgstr "Z_aleg�e zadania:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Show appointment _end times in week and month views"
 msgstr ""
 "Wy�wietlanie _czas�w zako�czenia termin�w w widoku tygodniowym i miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Wy�wietlanie _numer�w tygodni w przegl�darce dat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "Pocz�tek _dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "_Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "_Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Tas_ks due today:"
 msgstr "Zadania na _dzi�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "Strefa c_zasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time di_visions:"
 msgstr "Prze_dzia�y czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "�roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Tydzie� roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Potwierdzanie przed usuni�ciem element�w"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekend�w na widoku miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "Wy�wi_etlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "_Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_Pi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "Og�_lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zako�czonych zada� po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Other"
 msgstr "_Inne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Task List"
 msgstr "Lista _zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "�_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "przed pocz�tkiem terminu"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Termin spotkania zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to spotkanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to zadanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� ten wpis dziennika?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Zdarzenie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Zadanie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika zosta� usuni�ty."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulowa� je wszystkie i zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono �adnych zmian, zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Zdarzenie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Zadanie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika zosta� zmieniony."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulowa� je wszystkie i uaktualni� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono �adnych zmian, uaktualni� edytor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Zako�czone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Zako�czone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:303
 msgid "Could not update object!"
 msgstr "Nie mo�na uaktualni� obiektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1 mail/mail-callbacks.c:1
-#: mail/mail-display.c:1
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Nadpisa� plik?"
 
-#: calendar/gui/dialogs/comp-editor.c:1 mail/mail-callbacks.c:1
-#: mail/mail-display.c:1
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3868,53 +3872,53 @@ msgstr ""
 "Plik o tej nazwie ju� istnieje.\n"
 "Nadpisa� go?"
 
-#: calendar/gui/dialogs/comp-editor.c:1 ui/evolution-comp-editor.xml.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Czy na pewno chcesz usun�� termin \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Czy na pewno chcesz usun�� ten pozbawiony nazwy termin?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Czy na pewno chcesz usun�� zadanie \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Czy na pewno chcesz usun�� to pozbawione nazwy zadanie?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Czy na pewno chcesz usun�� wpis dziennika zatytu�owany \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Czy na pewno chcesz usun�� ten niezatytu�owany wpis dziennika?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Czy na pewno chcesz usun�� %d termin�w?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Czy na pewno chcesz usun�� %d zada�?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
@@ -3923,33 +3927,33 @@ msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
 msgid "Addressbook..."
 msgstr "Ksi��ka adresowa..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Oddelegowanie do:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Powtarzalno��"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -3957,71 +3961,71 @@ msgstr "Spotkanie"
 msgid "A_ll day event"
 msgstr "Wydarzenie ca�odni_owe"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
 msgstr "Z_aj�ty"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Taj_ny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
 msgid "F_ree"
 msgstr "_Wolny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Forma wy�wietlania czasu"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Ta osoba ju� uczestniczy w spotkaniu!"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -4030,101 +4034,101 @@ msgstr "_Oddeleguj do..."
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: 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 "Kliknij, aby doda� uczestnika"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Wsp�lna nazwa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Oddelegowane od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Oddelegowane do"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "J�zyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Cz�onek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1 filter/libfilter-i18n.h:1
-#: mail/message-list.etspec.h:1
+#: 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 "Stan"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1 mail/mail-config.glade.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: 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
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "_Change Organizer"
 msgstr "_Zmie� organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-meeting-time-sel.c:427
 msgid "_Invite Others..."
 msgstr "_Zapro� innych..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Inny organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powt�rzenia, kt�rych nie mo�na zmienia� za pomoc� Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "powt�rzeniami"
 
@@ -4132,247 +4136,247 @@ msgstr "powt�rzeniami"
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Co"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Wyj�tki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
 msgstr "Podgl�d"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regu�a powtarzalno�ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
 msgstr "D_owolna powtarzalno��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "Z_mie�"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
 msgstr "_Brak powtarzalno�ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
 msgstr "P_rosta powtarzalno��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "z"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "bez ko�ca"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "miesi�cy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "a� do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacje o spotkaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacje o zadaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Wpis dziennika zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% zako�czenia"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
 msgstr "Data zako�czenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Post�p"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: my-evolution/e-summary-preferences.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "P_riorytet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor.c:1
-#: calendar/gui/dialogs/task-editor.c:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 mail/folder-browser.c:1
-#: shell/e-shortcuts-view.c:1
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/e-week-view.c:1 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Usu� zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "Aktualizowanie obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknij, aby doda� zadanie"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:1
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4383,166 +4387,166 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:1 camel/camel-filter-driver.c:1
-#: camel/camel-filter-driver.c:1
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Zako�czone"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:1
-#: my-evolution/component-factory.c:1 shell/e-shortcuts.c:1
-#: shell/e-storage-set-view.c:1 shell/e-summary-storage.c:1
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:1
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutowe przedzia�y czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _ca�odniowe"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Usu� termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Usu� to _wyst�pienie"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "Czas rozpocz�cia spotkania: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "Czas rozpocz�cia zadania: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Czas rozpocz�cia informacji o zaj�to�ci: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Rozpocz�cie: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "Czas zako�czenia spotkania spotkania: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Czas zako�czenia informacji o zaj�to�ci: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Zako�czenie: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "Zadanie uko�czone: <b>"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "Zadanie na: <b>"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "B��d iKalendarza"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4550,512 +4554,512 @@ msgstr ""
 "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
 "poni�szego menu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
 msgid "Choose an action:"
 msgstr "Wyb�r czynno�ci:"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:779
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: shell/e-shell.c:1 widgets/misc/e-cell-date-edit.c:1
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:795
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:796
 msgid "Tentatively accept"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:797
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:811
 msgid "Send Free/Busy Information"
 msgstr "Wys�anie informacji o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:824
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:838
 msgid "Send Latest Information"
 msgstr "Wys�anie naj�wie�szej informacji"
 
-#: calendar/gui/e-itip-control.c:1 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> chce dodania do istniej�cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzyma� naj�wie�sze informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� spotkania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "Odpowied� na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulowa� spotkanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wys�a� niezrozumia�� wiadomo��."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomo�� o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> chce dodania do istniej�cego zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzyma�  naj�wie�sze informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpowiedzia� na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Odpowied� na zadanie"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulowa� zadanie."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomo�� o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> opublikowa� informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zwraca si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Odpowied� z informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� jest on nieprawid�owy!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� element ju� nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nie mo�na usun�� elementu z pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Nie mo�na odnale�� �adnej z twoich to�samo�ci na li�cie uczestnik�w!\n"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--do--"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Komunikat kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Wczytywanie kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Wczytywanie kalendarza..."
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-pocz�tkowa"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "data-ko�cowa"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:94
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:96
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:97
 msgid "Non-Participants"
 msgstr "Nie uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Zas�b"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Wymaga dzia�ania"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Pr�bnie zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
-#: calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: calendar/gui/e-meeting-model.c:1 calendar/gui/e-meeting-model.c:1
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "W trakcie"
 
 #. 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:1
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1
-#: calendar/gui/e-meeting-time-sel.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 widgets/misc/e-dateedit.c:1
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Opcj_e"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Wy�wietlanie w p_owi�kszeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Uaktualnij informacj� o zaj�to�ci"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Automatyczny wyb�r"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: calendar/gui/e-meeting-time-sel.c:1
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zada� z %s"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nie mo�na wczyta� zadania w \"%s\""
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
@@ -5064,321 +5068,321 @@ msgstr "Otwieranie kalendarza z %s"
 msgid "April"
 msgstr "Kwiecie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Sierpie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Grudzie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Luty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Przej�cie do daty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Przejd� do dzi�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Stycze�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Lipiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Czerwiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Marzec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Pa�dziernik"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:1
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Nie mo�na stworzy� generatora komponentu edytora"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "�r"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzie� dzie� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Wybrany tydzie� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesi�c (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2205
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2262
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2280
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2294
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zako�czenia: %i"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2306
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2320
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2331
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-#: mail/mail-callbacks.c:1 my-evolution/e-summary.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-message.xml.h:1
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-control.c:1
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI folderu zada�, kt�ry nale�y wy�wietli�"
 
-#: calendar/gui/tasks-control-factory.c:1
+#: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na stworzy� widoku zada�.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5386,7 +5390,7 @@ msgstr ""
 "Zadania umieszczone w folderze kalendarza zosta�y przez Evolution "
 "automatycznie przeniesione do nowego folderu zada�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5398,7 +5402,7 @@ msgstr ""
 "Niekt�re z zada� nie mog�y zosta� przeniesione, wi�c proces mo�e si� w "
 "przysz�o�ci powt�rzy�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5407,7 +5411,7 @@ msgstr ""
 "Nie mo�na otworzy� `%s'; �aden z element�w folderu kalendarza nie zosta� "
 "przeniesiony do folderu zada�."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5416,104 +5420,104 @@ msgstr ""
 "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana. Nie przeniesiono "
 "�adnych element�w z folderu kalendarza do folderu zada�."
 
-#: calendar/gui/weekday-picker.c:1 calendar/gui/weekday-picker.c:1
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "NPW�CPS"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "time-now wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time wymaga, aby 1. argument by� napisem z dat�/czasem w formacie ISO "
 "8601"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 "time-add-day wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day wymaga, aby 2. argument by� liczb� ca�kowit�"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 "time-day-begin wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 "time-day-end wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 2. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? wymaga, �eby 2. argument by� napisem"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:679
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", "
-"\"summary\", \"description\""
+"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", \"summary"
+"\", \"description\""
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? wymaga co najmniej 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5521,45 +5525,45 @@ msgstr ""
 "has-categories? wymaga, �eby wszystkie argumenty by�y napisami, lub �eby "
 "podany by� dok�adnie jeden argument, b�d�cy fa�szem logicznym (#f)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 "completed-before? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Przetworzenie wyra�enia wyszukiwania nie da�o warto�ci logicznej"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje czytelnego podpisywania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje weryfikacji"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje kodowania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5570,7 +5574,7 @@ msgstr ""
 "Kolejne operacje na tym serwerze nie b�d� mog�y zosta� odtworzone\n"
 "po ponownym pod��czeniu do sieci."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5581,89 +5585,89 @@ msgstr ""
 "%s\n"
 "Zmiany w tym folderze nie zostan� zsynchronizowane z serwerem."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Ponowne synchronizowanie z serwerem"
 
-#: camel/camel-disco-store.c:1
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "B��d przy analizie sk�adni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "B��d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-search.c:1 camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nieobs�ugiwana operacja: do��czenie listu: typ %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug wyra�enia: typ %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug uid: dla %s"
 
-#: camel/camel-folder.c:1
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Przenoszenie list�w"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5672,7 +5676,7 @@ msgstr ""
 "B��d w wyra�eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5681,255 +5685,255 @@ msgstr ""
 "B��d przy wykonywaniu wyra�enia wyszukiwania %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1 camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nag��wku: %s"
 
-#: camel/camel-folder-search.c:1 camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Niepoprawny typ warto�ci body-contains, oczekiwano napisu"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nie mo�na stworzy� potoku do pomocniczego programu blokuj�cego: %s"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Nie mo�na stworzy� procesu dla pomocniczego programu blokuj�cego: %s"
 
-#: camel/camel-lock-client.c:1 camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Nie mo�na zablokowa� \"%s\": b��d przy komuniacji z programem blokuj�cym"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nie mo�na zablokowa� \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:1 camel/camel-lock.c:1
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie mo�na stworzy� pliku blokady dla %s: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Up�yn�� czas przeznaczony na uzyskanie blokady pliku %s. Spr�buj ponownie "
 "p�niej."
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Uzyskanie blokady za pomoc� fcntl(2) nie powiod�o si�: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomoc� flock(2) nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nie mo�na sprawdzi� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie mo�na otworzy� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie mo�na otworzy� tymczasowego pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Zapisanie listu w pliku tymczasowym %s nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Stworzenie potoku nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo�na stworzy� procesu: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "B��d programu przesy�aj�cego poczt�: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Nieznany b��d)"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "B��d przy odczycie pliku z listem: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "B��d przy zapisie do tymczasowego pliku z listami: %s"
 
-#: camel/camel-movemail.c:1 camel/camel-movemail.c:1
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "B��d przy kopiowaniu tymczasowego pliku z listami: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Wprowad� swoje d�ugie has�o %s dla %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Wprowad� swoje d�ugie has�o %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na podpisa�"
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Nie mo�na podpisa� listu: nie podano has�a"
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo�na podpisa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na czytelnie podpisa�"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nie mo�na zweryfikowa� listu: brak tekstu, kt�ry mo�na zweryfikowa�"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo�na zweryfikowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Nie mo�na zweryfikowa� listu: nie mo�na stworzy� pliku tymczasowego: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nie mo�na zaszyfrowa� listu: brak tekstu, kt�ry mo�na zaszyfrowa�"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano has�a"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo�na zaszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "Nie mo�na odszyfrowa� listu: brak zaszyfrowanego tekstu, kt�ry mo�na "
 "odszyfrowa�"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nie mo�na odszyfrowa� listu: nie podano has�a"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo�na odszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nie mo�na za�adowa� %s: System nie obs�uguje �adowania modu��w."
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo�na wczyta� %s: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo�na wczyta� %s: Brak kodu inicjuj�cego w module."
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "serwer %s %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "us�uga %s dla %s na %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Anulowano po��czenie"
 
-#: camel/camel-remote-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/camel-remote-store.c:267
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-remote-store.c:1 camel/camel-remote-store.c:1
-#: camel/camel-remote-store.c:1
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:481
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Przy tej opcji ��czenie z serwerem nast�pi przy u�yciu anonimowego konta."
 
-#: camel/camel-sasl-anonymous.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiod�o si�."
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -5938,7 +5942,7 @@ msgstr ""
 "Niepoprawne informacje identyfikuj�ce poprzez adres e-mail:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -5947,7 +5951,7 @@ msgstr ""
 "Niepoprawne nieprzejrzyste informacje identyfikuj�ce:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -5956,11 +5960,11 @@ msgstr ""
 "Niepoprawne informacje identyfikuj�ce:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -5968,11 +5972,11 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a CRAM-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: 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."
@@ -5980,43 +5984,43 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a DIGEST-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Zbyt d�ugie wezwanie serwera (>2048 oktet�w)\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr "Niepoprawne wezwanie serwera\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection\" "
-"(jako�� ochrony)\n"
+"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection"
+"\" (jako�� ochrony)\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Odpwoied� serwera nie zawiera danych o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odpowied� serwera zawiera niekompletne dane o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Niepotwierdzona odpowied� serwera\n"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -6025,108 +6029,108 @@ msgstr ""
 "Nie mo�na pobra� biletu Kerberosa:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:32
 msgid "NT Login"
 msgstr "Logowanie NT"
 
-#: camel/camel-sasl-login.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a w postaci "
 "czystego tekstu."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr "Nieznany stan uwierzytelnienia."
 
-#: camel/camel-sasl-plain.c:1 camel/providers/imap/camel-imap-provider.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Has�o"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP przed SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Ta opcja spowoduje uwierzytelnienie po��czenia POP przed wykorzystaniem SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "URI �r�d�a POP"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Uwierzytelnianie POP przed SMTP z u�yciem nieznanego transportu"
 
-#: camel/camel-sasl-popb4smtp.c:1
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP przed SMTP przy u�yciu �r�d�a nie b�d�cego typu pop"
 
-#: camel/camel-search-private.c:1
+#: camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiod�a si� kompilacja wyra�enia regularnego: %s: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u�ytkownika"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest �cie�ka"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Dostarczyciel poczty dla folder�w wirtualnych"
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Do odczytu poczty jako zapytania na innym zbiorze folder�w"
 
-#: camel/camel-session.c:1 camel/camel-session.c:1
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protoko�u \"%s\""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6135,56 +6139,56 @@ msgstr ""
 "Nie mo�na stworzy� katalogu %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Podaj swoje has�o dla %s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 "Wybierz przydomek zwi�zany z certyfikatem, kt�rego chcesz u�y� do podpisu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:209
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Certyfikat podpisu dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:249
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Certyfikat szyfruj�cy dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Nie mo�na odnale�� certyfikatu dla \"%s\"."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr "Nie mo�na odnale�� wsp�lnego algorytmu gromadz�cego."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:810
 msgid "Failed to decode message."
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-store.c:1
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na pobra� folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:1
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na stworzy� folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6194,7 +6198,7 @@ msgstr ""
 "Temat: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6209,7 +6213,7 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
-#: camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6228,184 +6232,184 @@ msgstr ""
 "Stan: %s\n"
 "Kraj: %s"
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Brak listu: %s"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie mo�na usun�� folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie mo�na usun�� folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:1
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 
-#: camel/camel-vtrash-folder.c:1
+#: camel/camel-vtrash-folder.c:117
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nie mo�na kopiowa� list�w z tego folderu �mietnka."
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "Odpowied� serwera zako�czy�a si� zbyt wcze�nie."
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo�na stworzy� katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo�na wczyta� zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zosta� usuni�ty stworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedost�pny"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:1 shell/e-shell-view.c:1
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Foldery"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "Wy�wietlanie tylko zasubskrybowanych folder�w"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "Przestrze� nazw"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtr�w w odniesieniu do nowych list�w w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Do przegl�dania i przechowywania poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji po��czenie z serwerem IMAP nast�pi przy u�yciu has�a w "
 "postaci czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obs�ugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj has�o IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono has�a."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6416,126 +6420,126 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Katalogi z listami formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach podobnych do MH."
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Dostarczanie lokalne"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 "Do pobierania lokalnej poczty ze standardowych kolejek w formacie mbox."
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Zastosowywanie filtr�w w odniesieniu do nowych list�w w INBOX"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Katalogi z listami formacie Maildir"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach Maildir."
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standardowe uniksowe kolejki mbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
 "w formacie mbox."
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest �cie�k� bezwzgl�dn�"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest zwyk�ym katalogiem"
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie mo�na pobra� folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:1 mail/mail-local.c:1
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie mo�na usun�� pliku z zestawieniem folderu \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-summary.c:1
+#: camel/providers/local/camel-local-summary.c:367
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie mo�na zapisa� zestawienia: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-local-summary.c:423
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie mo�na doda� listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6544,20 +6548,20 @@ msgstr ""
 "Nie mo�na pobra� listu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Nie ma takiego listu"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawarto�� listu"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6566,16 +6570,16 @@ msgstr ""
 "Nie mo�na otworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
 # y, c-format
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6584,60 +6588,60 @@ msgstr ""
 "Nie mo�na stworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" nie jest katalogiem z listami w formacie maildir."
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie mo�na usun�� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie mo�na przeszuka� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:1
-#: camel/providers/local/camel-maildir-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie mo�na otworzy� katalogu z listami ze scie�ki: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie mo�na stworzy� blokady folderu dla %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Anulowano do��czenie listu"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie mo�na do��czy� listu do pliku mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6646,17 +6650,17 @@ msgstr ""
 "Nie mo�na pobra� listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Stworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6665,7 +6669,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6674,14 +6678,14 @@ msgstr ""
 "Nie mo�na stworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwyk�ym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6690,162 +6694,162 @@ msgstr ""
 "Nie mo�na usun�� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
 #. 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:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Zapisywanie folderu"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie mo�na otworzy� folderu %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Powa�ny b��d sk�adniowy na pozycji %ld w folderze %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie mo�na sprawdzi� folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo�na otworzy� tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "B��d przy zapisie do tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo�na zamkn�� folderu �r�d�owego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo�na zamkn�� folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany b��d: %s"
 
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu MH"
 
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/local/camel-mh-summary.c:1
+#: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie mo�na otworzy� �cie�ki katalogu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nie mo�na do��czy� listu do pliku kolejki: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Plik %s z kolejk� list�w"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo�na usuwa� folder�w kolejek"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu tymczasowego %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu kolejki %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6854,68 +6858,68 @@ msgstr ""
 "Nie mo�na zsynchronizowa� folderu kolejki %s: %s\n"
 "Folder mo�e by� uszkodzony, zapisano kopi� w \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Podaj has�o NNTP dla %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Serwer odrzuci� nazw� u�ytkownika"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Wys�anie nazwy u�ytkownika do serwera nie powiod�o si�"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Serwer odrzuci� nazw� u�ytkownika/has�o"
 
-#: camel/providers/nntp/camel-nntp-folder.c:1
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Nie odnaleziono listu %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nie mo�na pobra� z serwera listy grup."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nie mo�na odczyta� pliku z list� grup dla %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nie mo�na zapisa� pliku z list� grup dla %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nowiny USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "To jest dostawca pozwalaj�cy na odczyt i wysy�anie na grupy nowin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nie mo�na otworzy� katalogu serwera nowin: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za po�rednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6923,71 +6927,71 @@ msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze NNTP b�dzie przeprowadzane z "
 "u�yciem has�a w postaci czystego tekstu."
 
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie mo�na otworzy� lub stworzy� pliku .newsrc dla %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nie mo�na sprawdzi� nowych list�w na serwerze POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie mo�na otworzy� folderu: spis list�w by� niekompletny."
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Oczyszczanie z usuni�tych list�w"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nie mo�na pobra� listu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie mo�na pobra� listu z serwera POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto�ci uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie %d. listu z serwera POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Miejsce przechowywania list�w"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Pozostawianie list�w na serwerze"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Do ��czenia si� i pobierania poczty z serwer�w POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6996,7 +7000,7 @@ msgstr ""
 "u�yciem has�a w postaci czystego tekstu. Wiele serwer�w POP obs�uguje tylko "
 "t� opcj�."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -7006,34 +7010,34 @@ msgstr ""
 "u�yciu protoko�u APOP. Mo�e on nie funkcjonowa� dla wszystkich u�ytkownik�w, "
 "nawet, je�li serwer teoretycznie obs�uguje protok�."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze POP b�dzie przeprowadzane przy "
 "u�yciu Kerberosa 4 ."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP pod adresem %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPodaj has�o POP3 dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7042,12 +7046,12 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7055,7 +7059,7 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Brak obs�ugi wymaganego mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7064,22 +7068,22 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Nieoczekiwana odpowied� od serwera POP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
-#: mail/mail-config.glade.h:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -7087,177 +7091,177 @@ msgstr ""
 "Do wysy�ania poczty poprzez przekazania jej dzia�aj�cemu lokalnie programowi "
 "\"sendmail\"."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie mo�na stworzy� potoku do programu sendmail: %s: nie wys�ano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo�na stworzy� procesu dla programu sendmail: %s: nie wys�ano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie mo�na wys�a� listu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Program sendmail zosta� przerwany przez sygna� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie mo�na wykona� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "Program sendmail zosta� zako�czony z kodem stanu %d: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Nie mo�na odnale�� adresu \"Od\" w li�cie"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Wysy�anie list�w za pomoc� programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Do wysy�ania poczty poprzez ��czenie si� ze zdalnym serwerem pocztowym przy "
 "u�yciu SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "B��d sk�adniowy. Nie rozpoznano polecenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "B��d sk�adniowy w�r�d parametr�w lub argument�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stan systemu lub odpowied� z pomoc� systemow�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Us�uga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Us�uga zamyka kana� transmisyjny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Us�uga nie jest dost�pna, zamykanie kana�u transmisyjnego"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Pomy�lnie wykonano ��dan� operacj� na li�cie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "U�ytkownik nie jest lokalny; przes�anie do <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji na li�cie: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Przerwano ��dan� czynno��: b��d przy przetwarzaniu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "U�ytkownik nie jest lokalny; spr�buj <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Nie wykonano ��danej operacji: brak miejsca w miejscu przechowywania list�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Przerwano ��dan� czynno��: przekroczony wykorzystany rozmiar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Nie wykonano ��danej operacji: niedozwolona nazwa skrzynki"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Rozpocznij wprowadzanie listu; zako�cz poprzez <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transakcja nie powiod�a si�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Potrzebna jest zmiana has�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizm uwierzytelniania jest zbyt s�aby"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��dany miechanizm uwierzytelniaj�cy wymaga szyfrowania"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "B��dna odpowied� na powitanie: %s: prawdopodobnie mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPodaj has�o SMTP dla %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7268,179 +7272,179 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Wysy�anie list�w za pomoc� SMTP poprzez %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie mo�na wys�a� listu: nie podano adresu nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo�na wys�a� listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1 mail/mail-ops.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Up�yn�� czas oczekiwania po HELO: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "B��dna odpowied� na HELO: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "B��dna odpowied� na MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po RCPT TO: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "B��dna odpowied� na RCPT TO: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "B��dna odpowied� na DATA: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Up�yn�� czas oczekiwania na wys�anie DATA: przerwanie listu: %s: nie wys�ano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "B��dna odpowied� na DATA: przerwanie listu: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Up�yn�� czas oczekiwania po QUIT: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "B��dna odpowied� na QUIT: %s: mo�na kontynuowa�"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajt�w"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:1 mail/mail-display.c:1
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "za��cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
-#: composer/e-msg-composer-attachment.c:1
-#: composer/e-msg-composer-attachment.c:1
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie mo�na za��czy� pliku %s: %s"
 
-#: composer/e-msg-composer-attachment.c:1
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
@@ -7449,77 +7453,77 @@ msgstr "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
 msgid "Attachment properties"
 msgstr "W�a�ciwo�ci za��cznika"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-#: composer/e-msg-composer-select-file.c:1
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod kt�re zostanie przes�ana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 "Podaj adresy, pod kt�re zostanie przes�ana kopia listu bez listy odbiorc�w."
 
-#: composer/e-msg-composer-select-file.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7528,29 +7532,29 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Ostrze�enie!"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7558,16 +7562,16 @@ msgstr ""
 "Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7576,7 +7580,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7585,7 +7589,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7594,7 +7598,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7602,7 +7606,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7612,23 +7616,23 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7636,7 +7640,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7644,7 +7648,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7652,15 +7656,15 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu, poniewa� w komponencie\n"
 "pocztowym nie zosta�y jeszcze skonfigurowane �adne to�samo�ci."
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie mo�na zainicjowa� edytora list�w Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:1
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr "Evolution - pakiet do pracy grupowej"
 
@@ -7668,7 +7672,7 @@ msgstr "Evolution - pakiet do pracy grupowej"
 msgid "address card"
 msgstr "karta adresowa"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
@@ -7676,178 +7680,178 @@ msgstr "informacje kalendarza"
 msgid "Body contains"
 msgstr "Tre�� zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:2
 msgid "Body does not contain"
 msgstr "Tre�� nie zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:3
 msgid "Body or subject contains"
 msgstr "Tre�� lub temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:4
 msgid "Message contains"
 msgstr "List zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Lista odbiorc�w zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Nadawca zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: default_user/searches.xml.h:1
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
 #. Remember the password?
-#: e-util/e-passwords.c:1 mail/mail-session.c:1
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: e-util/e-passwords.c:1 mail/mail-session.c:1
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 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:1
+#: e-util/e-time-utils.c:178
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %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:1
+#: e-util/e-time-utils.c:183
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:194
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%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:1
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%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:1
+#: e-util/e-time-utils.c:203
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%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:1
+#: e-util/e-time-utils.c:208
 msgid "%m/%d/%Y %H:%M"
 msgstr "%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:1
+#: e-util/e-time-utils.c:213
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:218
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1 e-util/e-time-utils.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "rok"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "miesi�c"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "miesi�cy"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "tydzie�"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "tygodni"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "godzina"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:194
 msgid "You have forgotten to choose a date."
 msgstr "Nie zesta�a wybrana data."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:196
 msgid "You have chosen an invalid date."
 msgstr "Zosta�a wybrana niepoprawna data."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -7856,7 +7860,7 @@ msgstr ""
 "Data listu b�dzie por�wnywana z czasem\n"
 "zastosowania filtra."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -7864,7 +7868,7 @@ msgstr ""
 "Data listu b�dzie por�wnywana z czasem podanym\n"
 "poni�ej."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -7875,62 +7879,62 @@ msgstr ""
 "\"tydzie� temu\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "bie��cym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "podanym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "czasem podanym wzgl�dem bie��cego"
 
 #. The dialog
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:394
 msgid "Select a time to compare against"
 msgstr "Wyb�r czasu odniesienia"
 
 #. The label
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Por�wnanie z"
 
-#: filter/filter-datespec.c:1 filter/filter-datespec.c:1
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:575
 msgid " ago"
 msgstr " temu"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:621
 msgid "ago"
 msgstr "temu"
 
-#: filter/filter-datespec.c:1 mail/message-list.c:1
+#: filter/filter-datespec.c:711 mail/message-list.c:939
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybra� dat�>"
 
-#: filter/filter-editor.c:1 filter/filter.glade.h:1
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "Dodaj czynno��"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7938,20 +7942,20 @@ msgstr ""
 "Nie zosta� wybrany folder.\n"
 "Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
-#: mail/mail-account-gui.c:1
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Wyb�r folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Podaj URI folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybra� folder> "
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -7960,43 +7964,43 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:1
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "nadchodz�ce"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "wychodz�ce"
 
@@ -8004,288 +8008,288 @@ msgstr "wychodz�ce"
 msgid "Edit Filters"
 msgstr "Modyfikacja filtr�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolder�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Nadchodz�ce"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Wychodz�ce"
 
-#: filter/filter.glade.h:1 filter/vfolder-editor.c:1
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:11
 msgid "specific folders only"
 msgstr "tylko okre�lone foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "�r�d�a VFolder�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:13
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:15
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Przypisz punkty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Za��czniki"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data wys�ania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Usuni�ty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nie ko�czy si� na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "nie brzmi jak"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "nie rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "ko�czy si� na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:22
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Wa�ny"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "jest wi�kszy ni�"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "jest mniejszy ni�"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "List zosta� otrzymany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "List zosta� wys�any"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "w lub po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "w lub przed"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Lista odbiorc�w"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: filter/libfilter-i18n.h:1 filter/score-rule.c:1 filter/score-rule.c:1
-#: mail/message-list.etspec.h:1
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:1 mail/mail-callbacks.c:1
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:1 mail/mail-format.c:1
-#: mail/message-list.etspec.h:1
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "jest po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "jest przed"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regu�y"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Regu�y punktacji"
 
-#: filter/vfolder-rule.c:1
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje star� poczt� Elma"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importowanie..."
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Poczekaj chwil�"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importowanie %s jako %s"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizowanie %s"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1 mail/component-factory.c:1
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Poczta"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8293,15 +8297,15 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:1 importers/pine-importer.c:1
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Ksi��ka adresowa"
 
-#: importers/evolution-gnomecard-importer.c:1
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8309,23 +8313,23 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
-#: importers/netscape-importer.c:1 importers/pine-importer.c:1
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizowanie katalogu"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Rozpoczynanie importowania"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8333,11 +8337,11 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje stare dane Pine'a"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8345,7 +8349,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8353,68 +8357,68 @@ msgstr "Pine"
 msgid "Evolution component for handling mail."
 msgstr "Komponent Evolution obs�uguj�cy poczt�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Edytor list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr "Komponent zestawienia wykonawczego poczty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Komponent wy�wietlania folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Generator komponent�w folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Factory for the Mail Summary component."
 msgstr "Generator komponentu zestawienia poczty."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "Interfejs konfiguracji poczty"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Folder zawieraj�cy poczt�"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Folder przechowuj�cy poczt� (wewn�trzny)"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Wirtualny �mietnik"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Folder wirtualnego �mietnika"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo�e zawiera� list�w."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8422,206 +8426,206 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nowy _list"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:1 mail/mail-display.c:1
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo�na stworzy� katalogu tymczasowego: %s"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/folder-browser.c:1 mail/folder-browser.c:1
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "zaznaczonych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Stw�rz vFolder na podstawie wyszukiwania"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Oz_nacz jako niewa�ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "_Stw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtr w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.h:1
+#: mail/folder-browser.h:26
 msgid "Default"
 msgstr "Domy�lny"
 
-#: mail/folder-info.c:1
+#: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
 
@@ -8629,7 +8633,7 @@ msgstr "Pobieranie informacji o folderze"
 msgid "Factory to import mbox into Evolution"
 msgstr "Generator importu plik�w mbox do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importuje pliki mbox do Evolution."
 
@@ -8637,7 +8641,7 @@ msgstr "Importuje pliki mbox do Evolution."
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr "Generator importu plik�w Outlook Express 4 do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuje pliki Outlook Express 4 do Evolution."
 
@@ -8645,23 +8649,23 @@ msgstr "Importuje pliki Outlook Express 4 do Evolution."
 msgid "Body contents"
 msgstr "Tre�� zawiera"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Bie��cy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:3
 msgid "Indexing:"
 msgstr "Indeksowanie:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Format skrzynki"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Nowy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8672,41 +8676,41 @@ msgstr ""
 "do stanu, w kt�rym automatyczne odtworzenie danych nie b�dzie\n"
 "mo�liwe. Korzystaj wi�c z tej opcji bardzo ostro�nie."
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:1 mail/mail-account-editor.c:1
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Nie zosta�y podane wszystkie wymagane informacje."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:1
+#: mail/mail-account-editor-news.c:160
 msgid "Evolution News Editor"
 msgstr "Edytor nowin Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr "Nie mo�na zapisa� pliku z podpisem."
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8716,68 +8720,68 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Nie mo�na stworzy� dw�ch kont o tej samej nazwie."
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:144
 msgid " (default)"
 msgstr " (domy�lne)"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:189
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:191
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Ustawienia poczty"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:1 mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8790,7 +8794,7 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8798,7 +8802,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8806,12 +8810,12 @@ msgstr ""
 "Przed stworzeniem listu nale�y skonfigurowa�\n"
 "spos�b przekazywania list�w."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8819,11 +8823,11 @@ msgstr ""
 "Zamierzasz wys�a� list zapisany w HTML-u, lecz wymienieni poni�ej odbiorcy "
 "�e nie chc� otrzymywa� list�w w tej postaci:\n"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8831,7 +8835,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8840,11 +8844,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (bcc)"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8854,40 +8858,40 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Ten list zawiera niepoprawnych adresat�w:"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wys�aniem listu nale�y poda� jego odbiorc�w."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Przed wys�aniem listu nale�y skonfigurowa� konto."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li�cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowa� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8895,7 +8899,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8903,28 +8907,28 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wys�a� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1 widgets/misc/e-messagebox.c:1
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze�enie"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8937,11 +8941,11 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8950,24 +8954,24 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Czy na pewno chcesz otworzy� wszystkie %d list�w w osobnych oknach?"
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
@@ -8978,7 +8982,7 @@ msgstr ""
 "chyba, �e chcesz, aby znajduj�ce si� w nich informacje by�y zawarte w "
 "wysy�anych listach."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system\n"
@@ -8988,11 +8992,11 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
 msgstr "Wybierz spo�r�d poni�szych opcji"
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system\n"
@@ -9002,7 +9006,7 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and\n"
@@ -9021,16 +9025,16 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:316
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9045,16 +9049,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Nadchodz�ce"
 
-#: mail/mail-config.c:1
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:1 mail/mail-config.c:1
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
@@ -9062,67 +9066,67 @@ msgstr "Nawi�zywanie po��czenia z serwerem..."
 msgid " _Check for supported types "
 msgstr " _Sprawd� obs�ugiwane typy "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:9
 msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w s_zyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:10
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Podpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:13
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:14
 msgid "Composer"
 msgstr "Nowe listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:15
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9137,231 +9141,231 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "D_omy�lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "Domy�lny spos�b \"przesy�ania\" list�w: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Domy�lny zestaw znak�w: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Wy�wietl"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:1 shell/e-local-storage.c:1
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:1 widgets/misc/e-filter-bar.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Zmodyfikuj..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Aktywne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Plik z podpisem w HTML-u:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Nowiny"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:50
 msgid "PGP _Key ID:"
 msgstr "ID _klucza PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Potwierdzanie przy wysy�aniu list�w w formacie HTML do os�b, kt�re ich nie "
 "chc�"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Potwierdzanie przy wysy�aniu listu tylko z _ukrytymi adresatami (bcc)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:60
 msgid "Re_member this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Bezpieczne MIME"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Wyb�r pliku dziennika komunikat�w o filtrowaniu..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Wyb�r pliku programu PGP"
 
-#: mail/mail-config.glade.h:1 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
-#: shell/e-local-storage.c:1
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Wys�ane"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:74
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:76
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:78
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Plik z podpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "�r�d�o"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "�r�d�a"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Foldery specjalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:86
 msgid "Use s_ecure connection (SSL)"
 msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9371,305 +9375,305 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:92
 msgid "_Always sign outgoing messages when using this account"
 msgstr "P_odpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:93
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:94
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:95
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:97
 msgid "_Drafts folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "Podpis w _HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "_Pobieranie obraz�w, je�li nadawca jest w ksi��ce adresowej"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "_Dziennik komunikat�w o filtrowaniu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "�cie�ka programu _PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "�_cie�ka:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "Domy�lne _wysy�anie list�w w formacie HTML."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:115
 msgid "_Server Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:118
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nie mo�na stworzy� kontekstu podpisu PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "Nie mo�na stworzy� kontekstu weryfikacji PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "Nie mo�na stworzy� kontekstu szyfrowania PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "Nie mo�na stworzy� kontekstu odszyfrowania PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo�na stworzy� kontekstu podpisu S/MIME."
 
 # FIXME
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nie mo�na stworzy� kontekstu certyfikacji S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nie mo�na stworzy� kontekstu szyfrowania S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nie mo�na stworzy� kontekstu otoczki S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na stworzy� kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy�wietl na miejscu (za pomoc� programu %s)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Nie mo�na przetworzy� jako list MIME. Wy�wietlanie w postaci �r�d�owej."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1799
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "List zosta� podpisany cyfrowo. Kliknij ikon� zamka, aby uzyska� wi�cej "
 "informacji."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1822
 msgid "Evolution does not recognize this type of signed message."
 msgstr "Evolution nie rozpoznaje podpisanego listu tego typu."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wska�nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9678,27 +9682,27 @@ msgstr ""
 "Nie mo�na zapisa� metainformacji zwi�zanych z folderem; prawdopodobnie\n"
 "otwarcie folderu nie b�dzie ju� mo�liwe: %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie mo�na zapisa� metadanych zwi�zanych z folderem w %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "Nie mo�na przekonfigurowa� %s, poniewa� nie jest on lokalnym folderem"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9706,16 +9710,16 @@ msgstr ""
 "Je�li otwarcie tej skrzynki nie b�dzie ju� mo�liwe,\n"
 "w�wczas mo�e by� konieczne r�czne jej naprawienie."
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9724,7 +9728,7 @@ msgstr ""
 "B��d podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9733,121 +9737,121 @@ msgstr ""
 "B��d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Mimo wszystko, list zosta� wys�any pomy�lnie."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li�cie z %d"
 
-#: mail/mail-ops.c:1 mail/mail-send-recv.c:1
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1 shell/e-local-storage.c:1
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "�mietnik"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9856,7 +9860,7 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9865,11 +9869,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9878,133 +9882,133 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-search-dialogue.c:1
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Znajd�"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "List bez nazwy"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Pusty list"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li�cie"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Z rozr�nianiem ma�ych i wielkich liter"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Wyszukiwanie w prz�d"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Znajd�:"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Dopasowania:"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serwer: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�cie�ka: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Wysy�anie i odbi�r poczty"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:1 mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowad� has�o dla %s"
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:313
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Przes�any list - %s"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolder�w pod uri: %s"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10017,134 +10021,134 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ba zmodyfikowania vfoldera \"%s\", kt�ry nie istnieje"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:1
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:639
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:640
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:641
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:642
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:643
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:647
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:648
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:652
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:653
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:903
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:910
 msgid "Today %l:%M %p"
 msgstr "Dzi� %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:919
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:931
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:941
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia list�w"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Oznaczony"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizowanie folder�w pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:221
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizowanie g��wnych folder�w na \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subskrybowanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
@@ -10152,31 +10156,31 @@ msgstr "Wybierz serwer."
 msgid " _Refresh List "
 msgstr " _Od�wie� list� "
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:2
 msgid "All folders"
 msgstr "Wszystkie foldery"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:3
 msgid "Display options"
 msgstr "Opcje wy�wietlania"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:4
 msgid "Folders whose names begin with:"
 msgstr "Foldery o nazwach rozpoczynaj�cych si� od:"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Zarz�dzanie subskrybcjami"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:6
 msgid "Show _folders from server: "
 msgstr "_Wy�wietlanie folder�w na serwerze: "
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Zasubskrybuj"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "O_dsubskrybuj"
 
@@ -10184,1293 +10188,1295 @@ msgstr "O_dsubskrybuj"
 msgid "Evolution component for the executive summary."
 msgstr "Komponent Evolution obs�uguj�cy zestawienie wykonawcze."
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Folder zawieraj�cy Zestawienie Evolution"
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Nie mo�na zainicjowa� komponentu zestawienia Evolution."
 
-#: my-evolution/e-summary-calendar.c:1 my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%d %B, %k:%M"
 
 # [cyba] Wypada zostawi� ten format 12-godzinny, bo jest te� alternatywa (z %k) wybierana przez program
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%d %B, %l:%M"
 
-#: my-evolution/e-summary-mail.c:1
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-preferences.c:1
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr "EPGD:EPKK:EPWA"
+
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL �r�d�a nowo�ci, kt�re chcesz doda�"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Ustawienia zestawienia"
 
-#: my-evolution/e-summary-rdf.c:1 my-evolution/e-summary-rdf.c:1
-#: my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Nie mo�na nawi�za� po��czenia z serwerem pogodowym</b></dd>"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "Pogoda"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:1
-msgid "KBOS"
-msgstr "EPGD:EPKK:EPWA"
-
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regiony"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B, %Y"
 
-#: my-evolution/e-summary.c:1 ui/my-evolution.xml.h:1
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Wydrukuj"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:1
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\n"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid "�F"
 msgstr "�F"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:29
 msgid "�C"
 msgstr "�C"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "knots"
 msgstr "w�z�y"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:33
 msgid "kph"
 msgstr "km/h"
 
 # [cyba] mo�e raczej calHg??
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:38
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "miles"
 msgstr "mile"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:41
 msgid "kilometers"
 msgstr "kilometry"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Fragmentaryczne chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Rzadkie chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Kilka chmur"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Zachmurzenie"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Niepoprawna warto��"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Zmienny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "P�noc"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "P�noc - p�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Wsch�d - p�nocny wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "Wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Wsch�d - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "Po�udnie - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "Po�udnie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "Po�udnie - po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "Po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "Zach�d - po�udniowy zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "Zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "Zach�d - p�nocny zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "P�nocny zach�d"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "P�noc - p�nocny zach�d"
 
 #. DRIZZLE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "M�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Nadchodz�ca m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Lekka m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Umiarkowana m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Obfita m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "S�aba m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "�agodna m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Cz�ciowa m�awka"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Burza"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Wietrzna m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Kr�tkotrwa�a m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Zbli�aj�ca si� m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Utrzymuj�ca si� m�awka"
 
 #. RAIN
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Nadchodz�cy deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Lekki deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Umiarkowany deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Obfity deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "S�aby deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "�agodny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Cz�ciowe opady deszczu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Szalej�ce opady deszczu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Kr�tkotrwa�y deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Zbli�aj�cy si� deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Utrzymuj�cy si� deszcz"
 
 #. SNOW
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "�nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Nadchodz�cy �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Lekki �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Umiarkowany �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Obfity �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "S�aby �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "�agodny �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Cz�ciowe opady �niegu"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Burza �nie�na"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Szalej�ce opady �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Kr�tkotrwa�y �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Zbli�aj�cy si� �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Utrzymuj�cy si� �nieg"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Nadchodz�ce ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Lekkie ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Umiarkowane ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Obfite ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "S�abe ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "�agodne ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Cz�ciowe ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Szalej�ce ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Kr�tkotrwa�e ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Zbli�aj�ce si� ziarna �niegu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Utrzymuj�ce si� ziarna �niegu"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Nadchodz�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Nieco kryszta�k�w lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Umiarkowane kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr "Obfite kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr "�agodne kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr "Cz�ciowe kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Burza z kryszta�kami lodowymi"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr "Szalej�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr "Kr�tkotrwa�e kryszta�ki lodu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr "Zbli�aj�ce si� kryszta�ki lodu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr "Utrzymuj�ce si� krzyszta�ki lodu"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr "Nadchodz�ce kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr "Nieco kulek lodowych"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr "Umiarkowane kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr "Obfite kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr "S�abe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr "�agodne kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr "Cz�ciowe kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr "Burza z kulkami lodowymi"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr "Szalej�ce kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr "Kr�tkotrwa�e kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr "Zbli�aj�ce si� kulki lodowe"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr "Utrzymuj�ce si� kulki lodowe"
 
 #. HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Nadchodz�cy grad"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Lekki grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Umiarkowany grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Obfity grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "S�aby grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "�agodny grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Cz�ciowy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Burza gradowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Szalej�cy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Kr�tkotrwa�y grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Zbli�aj�cy si� grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Utrzymuj�cy si� grad"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Nadchodz�cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Umiarkowany gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Obfity gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "S�aby gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "�agodny gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Cz�ciowy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Ma�a burza gradowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Szalej�cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Kr�tkotrwa�y gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Zbli�aj�cy si� gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Utrzymuj�cy si� gradzik"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Nieznane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Nadchodz�ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Lekkie opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Umiarkowane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Obfite opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "S�abe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "�agodne opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Cz�ciowe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Nieznana burza"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Szalej�ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Kr�tkotrwa�e opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Zbli�aj�ce si� opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Utrzymuj�ce si� opady"
 
 #. MIST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Nadchodz�ca mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Lekka mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Umiarkowana mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "G�sta mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "S�aba mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "�agodna mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Cz�ciowa mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Mgie�ka z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Zbli�aj�ca si� mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Utrzymuj�ca si� mgie�ka"
 
 #. FOG
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "Nadchodz�ca mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "Lekka mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "Umiarkowana mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "G�sta mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "S�aba mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "�agodna mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "Cz�ciowa mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "Mg�a z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "Zbli�aj�ca si� mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "Utrzymuj�ca si� mg�a"
 
 #. SMOKE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Nadchodz�cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Rzadki dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Umiarkowany dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "G�sty dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "S�aby dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "�agodny dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Cz�ciowy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:300
 msgid "Thunderous smoke"
 msgstr "Og�uszaj�cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Dym z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Zbli�aj�cy si� dym"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Nadchodz�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Umiarkowany popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "G�sty popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "S�aby popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "�agodny popi� wulaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Cz�ciowy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:315
 msgid "Thunderous volcanic ash"
 msgstr "Og�uszaj�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "Szalej�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:317
 msgid "Showers of volcanic ash"
 msgstr "Kr�tkotrwa�y popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "Zbli�aj�cy si� popi� wulkaniczny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "Utrzymuj�cy si� popi� wulkaniczny"
 
 #. SAND
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "Nadchodz�cy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "Lekki piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "Umiarkowany piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "Obfity piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "�agodny piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "Cz�ciowy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "Szalej�cy piasek"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "Zbli�aj�cy si� piasek"
 
 #. HAZE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "Zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "Nadchodz�ce zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "Lekkie zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "Umiarkowane zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "G�ste zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "S�abe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "�agodne zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "Cz�ciowe zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "Zamglenie z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "Zbli�aj�ce si� zamglenie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "Utrzymuj�ce si� zamglenie"
 
 #. SPRAY
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:352
 msgid "Spray"
 msgstr "Py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:353
 msgid "Spray in the vicinity"
 msgstr "Nadchodz�cy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:354
 msgid "Light spray"
 msgstr "Lekki py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:355
 msgid "Moderate spray"
 msgstr "Umiarkowany py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:356
 msgid "Heavy spray"
 msgstr "Obfity py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:357
 msgid "Shallow spray"
 msgstr "S�aby py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:358
 msgid "Patches of spray"
 msgstr "�agodny py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:359
 msgid "Partial spray"
 msgstr "Cz�ciowy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:361
 msgid "Blowing spray"
 msgstr "Szalej�cy py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:363
 msgid "Drifting spray"
 msgstr "Zbli�aj�cy si� py� wodny"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:364
 msgid "Freezing spray"
 msgstr "Utrzymuj�cy si� py� wodny"
 
 #. DUST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "Nadchodz�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "Lekkie tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "Umiarkowane tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "Obfite tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "�agodne tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "Cz�ciowe tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "Szalej�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "Zbli�aj�ce si� tumany kurzu"
 
 #. SQUALL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "Nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "Nadchodz�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "Lekka nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "Umiarkowana nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "Obfita nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "�agodna nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "Og�uszaj�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "Szalej�ca nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "Zbli�aj�ca si� nawa�nica"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "Utrzymuj�ca si� nawa�nica"
 
 #. SANDSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "Burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "Nadchodz�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "Lekka burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "Umiarkowana burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "Obfita burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "S�aba burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "�agodna burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "Og�uszaj�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "Szalej�ca burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "Zbli�aj�ca si� burza piaskowa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "Utrzymuj�ca si� burza piaskowa"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "Kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "Nadchodz�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "Lekka kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "Umiarkowana kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "Obfita kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "S�aba kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "�agodna kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "Og�uszaj�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "Szalej�ca kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "Zbli�aj�ca si� kurzawa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "Utrzymuj�ca si� kurzawa"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr "Tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr "Nadchodz�ca tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr "Lekka tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr "Umiarkowana tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr "G�sta tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr "S�aba tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr "�agodna tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr "Cz�ciowa tr�ba powietrzna"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr "Tr�ba powietrzna z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr "Zbli�aj�ca si� tr�ba powietrzna"
 
 #. TORNADO
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Nadchodz�ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Umiarkowane tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr "Rozszala�e tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr "Og�uszaj�ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr "Zbli�aj�ce si� tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr "Utrzymuj�ce si� tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr "Wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr "Nadchodz�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr "Lekkie wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr "Umiarkowane wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr "Obfite wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr "S�abe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr "�agodne wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr "Cz�ciowe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr "Szalej�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 
@@ -11478,115 +11484,115 @@ msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 msgid " _Remove"
 msgstr " _Usu�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "Dodaj �_r�d�o"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:3
 msgid "Al_l stations:"
 msgstr "Wszy_stkie stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:4
 msgid "All _folders:"
 msgstr "W_szystkie foldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:5
 msgid "All news _feeds:"
 msgstr "W_szystkie �r�d�a nowo�ci:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:6
 msgid "C_elcius"
 msgstr "_Celsjusza"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:8
 msgid "How many days should the calendar display at once?"
 msgstr "Liczba dni wy�wietlanych jednocze�nie w kalendarzu"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
 msgstr "_Maksymalna liczba wy�wietlanych element�w:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:11
 msgid "One mont_h"
 msgstr "Jeden _miesi�c"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:12
 msgid "One w_eek"
 msgstr "J_eden tydzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:13
 msgid "R_efresh time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:14
 msgid "Refresh _time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:15
 msgid "S_how full path for folders"
 msgstr "_Wy�wietlanie pe�nych �cie�ek folder�w"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _all tasks"
 msgstr "Wy�wietlanie _wszystkich zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:17
 msgid "Show _today's tasks"
 msgstr "Wy�wietlanie _dzisiejszych zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:18
 msgid "Show temperatures in:"
 msgstr "Wy�wietlanie temperatur w skali:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:19
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr "Ustawienia dotycz�ce pogody"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Display folders:"
 msgstr "Wy�wi_etlane foldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Display stations:"
 msgstr "Wy�wi_etlane stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Displayed feeds:"
 msgstr "Wy�wi_etlane �r�d�a:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:25
 msgid "_Fahrenheit"
 msgstr "_Fahrenheita"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:26
 msgid "_Five days"
 msgstr "_Pi�� dni"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
 msgstr "Pocz_ta"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:28
 msgid "_News Feeds"
 msgstr "�r�d�a _nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:29
 msgid "_One day"
 msgstr "_Jeden dzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:30
 msgid "_Schedule"
 msgstr "P_lanowanie"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:31
 msgid "_Weather"
 msgstr "Pogod_a"
 
@@ -11594,31 +11600,31 @@ msgstr "Pogod_a"
 msgid "The Evolution shell."
 msgstr "Pow�oka Evolution."
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Wy�wietl szczeg�y"
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-local-storage.c:1 shell/e-shortcuts.c:1
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Nadchodz�ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Wychodz�ce"
 
-#: shell/e-local-storage.c:1
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11626,15 +11632,15 @@ msgstr ""
 "Uruchomiona w�a�nie nowa wersja Evolution wymaga zainstalowania\n"
 "dodatkowych plik�w w osobistym katalogu Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Kliknij \"OK\" aby zainstalowa� pliki lub \"Anuluj\" aby zako�czy�."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nie mo�na poprawnie uaktualni� plik�w"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11645,7 +11651,7 @@ msgstr ""
 "%s\n"
 "B��d: %s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11654,7 +11660,7 @@ msgstr ""
 "Wyst�pi� b��d przy kopiowaniu plik�w do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11665,7 +11671,7 @@ msgstr ""
 "Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11678,7 +11684,7 @@ msgstr ""
 "jego usuni�cie.\n"
 "Czy chcesz usun�� ten katalog?"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11689,49 +11695,49 @@ msgstr ""
 "Evolution. Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-shell-about-box.c:1
+#: shell/e-shell-about-box.c:40
 msgid "Evolution "
 msgstr "Evolution "
 
-#: shell/e-shell-about-box.c:1
+#: shell/e-shell-about-box.c:41
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-about-box.c:1
+#: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Nie mo�na przenie�� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Nie mo�na skopiowa� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nie mo�na skopiowa� folderu do jego folderu podrz�dnego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz skopiowa� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz przenie�� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11740,18 +11746,18 @@ msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:401
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Usuni�cie \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Czy na pewno chcesz usun�� folder \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11760,22 +11766,22 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Zmiana nazwy folderu"
 
-#: shell/e-shell-folder-commands.c:1
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Podana nazwa folderu nie jest poprawna: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -11784,11 +11790,11 @@ msgstr ""
 "Nie mo�na stworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - tworzenie nowego folderu"
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11796,19 +11802,19 @@ msgstr ""
 "Typ wybranego folderu nie jest poprawny w odniesieniu\n"
 "do ��danej operacji."
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:1 shell/e-shell-folder-title-bar.c:1
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Wybierz typ uruchamianego importera"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11822,13 +11828,13 @@ msgstr ""
 "Je�li nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spr�buje "
 "go rozpozna�."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Wybierz informacje, kt�re chcesz zaimportowa�"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11839,7 +11845,7 @@ msgstr ""
 "Importer nie jest gotowy.\n"
 "Oczekiwanie przez 5 sekund przed ponowieniem."
 
-#: shell/e-shell-importer.c:1 shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11848,16 +11854,16 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Mo�na importowa� tylko lokalne foldery"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11866,11 +11872,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11879,17 +11885,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d odczycie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11898,31 +11904,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11930,32 +11936,32 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/e-shell-importer.c:1 shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: shell/e-shell-importer.c:1 shell/importer/intelligent.c:1
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:1
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Zamykanie po��cze�..."
 
-#: shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
@@ -11964,11 +11970,11 @@ msgstr ""
 "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 "(%s)"
 
-#: shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-startup-wizard.c:169
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 
-#: shell/e-shell-startup-wizard.c:1
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11976,92 +11982,110 @@ msgstr ""
 "Wybierz informacje, kt�re\n"
 "chcesz zaimportowa�"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Nie podano nazwy pliku."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Ten folder nie mo�e zawiera� list�w."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje si� w �cie�ce."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:215
 msgid "About Ximian Evolution"
 msgstr "Informacje o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na kt�ry ma wskazywa� skr�t:"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:570
 #, c-format
 msgid "Error executing %s."
 msgstr "B��d przy wykonywaniu %s."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:672
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:1 ui/evolution.xml.h:1
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:1 ui/evolution.xml.h:1
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Brak)"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie z pod��czeniem do sieci. Aby "
 "przej�� w tryb bez pod��czenia, kliknij ten przycisk."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie bez pod��czenia do sieci. Aby "
 "przej�� w tryb z pod��czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12072,31 +12096,31 @@ msgstr ""
 "nieoczekiwanie zako�czy� dzia�anie. Aby ponownie uzyska� dost�p do\n"
 "danych, nale�y zako�czy� Evolution, a nast�pnie uruchomi� ponownie."
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:1 shell/e-storage.c:1
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "B��d og�lny"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12105,111 +12129,111 @@ msgstr ""
 "Czy na pewno chcesz usun�� z paska skr�t�w\n"
 "grup� \"%s\"?"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Zmie� nazw� wybranej grupy skr�t�w na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Wy�wietla skr�ty jako ma�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Wy�wietla skr�ty jako du�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:1 ui/evolution.xml.h:1
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Otw�rz w nowym _oknie"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otwiera w nowym oknie folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_Usu�"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
-#: shell/e-storage-set-view.c:1
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12218,133 +12242,133 @@ msgstr ""
 "Nie mo�na przenie�� folderu:\n"
 "%s"
 
-#: shell/e-storage.c:1 shell/e-storage.c:1
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Podany typ nie jest obs�ugiwany dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie mo�na ustawi� folderu jako potomka jednego z folder�w podrz�dnych"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na stworzy� folderu o tej nazwie"
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zako�czono %d%%)"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12355,7 +12379,7 @@ msgstr ""
 "\n"
 "Nieznany b��d."
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12368,7 +12392,7 @@ msgstr ""
 "Opis b��du otrzymany od systemu komponent�w:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:1
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12385,17 +12409,17 @@ msgstr ""
 msgid "Active connections"
 msgstr "Aktywne po��czenia"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Kliknij OK, aby zamkn�� powy�sze po��czenia i przej�� w tryb bez pod��czenia "
 "do sieci"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
 msgstr "Komputer"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
 msgstr "Obecnie aktywne s� nast�puj�ce po��czenia:"
 
@@ -12403,31 +12427,31 @@ msgstr "Obecnie aktywne s� nast�puj�ce po��czenia:"
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Typ folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
 msgstr "Okre�l miejsce stworzenia folderu:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "First Run Setup Assistant"
 msgstr "Druid wst�pnej konfiguracji"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Importing Data"
 msgstr "Importowanie danych"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:8
 msgid "Setup Assistant"
 msgstr "Druid konfiguracji"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:9
 msgid "Timezone "
 msgstr "Strefa czasowa"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:10
 msgid ""
 "Welcome to the Evolution first run setup assistant\n"
 "\n"
@@ -12437,7 +12461,7 @@ msgstr ""
 "\n"
 "Pomo�e ci on rozpocz�c prac� z programem"
 
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: shell/glade/evolution-startup-wizard.glade.h:13
 msgid "Your configuration is complete."
 msgstr "Konfiguracja zosta�a zako�czona."
 
@@ -12445,31 +12469,31 @@ msgstr "Konfiguracja zosta�a zako�czona."
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknij \"Zaimportuj\" aby rozpocz�� import pliku do Evolution. "
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Druid importu Evolution"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:3
 msgid "Evolution Importer Assistant"
 msgstr "Druid importu Evolution"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Import pliku (krok 3 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:5
 msgid "Importer Type (step 1 of 3)"
 msgstr "Typ importera (krok 1 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:6
 msgid "Select Importers (step 2 of 3)"
 msgstr "Wyb�r importer�w (krok 2 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:7
 msgid "Select a File (step 2 of 3)"
 msgstr "Wyb�r pliku (krok 2 z 3)"
 
-#: shell/importer/import.glade.h:1
+#: 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"
@@ -12479,408 +12503,408 @@ msgstr ""
 "Druid ten przeprowadzi ci� przez proces importu do Evolution\n"
 "zewn�trznych plik�w w wybranym formacie."
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Nie importuj"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Mo�na zaimportowa� do Evolution dane z nast�puj�cych plik�w:"
 
-#: shell/main.c:1
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ko�czy prac�..."
 
-#: shell/main.c:1
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:1
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:1
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:1
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotycz�ce przebiegu wykonania komponent�w."
 
-#: shell/main.c:1
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
 
-#: tools/evolution-addressbook-export.c:1
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "B��d przy odczycie domy�lnej ksi��ki adresowej."
 
-#: tools/evolution-addressbook-export.c:1
+#: tools/evolution-addressbook-export.c:46
 msgid "Output File"
 msgstr "Plik wy�ciowy"
 
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Plik wej�ciowy"
 
-#: tools/evolution-addressbook-import.c:1
+#: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Nie podano nazwy pliku."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
 msgstr "Tworzy now� list� kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-tasks.xml.h:1
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:12
 msgid "New List"
 msgstr "Nowa lista"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-tasks.xml.h:1
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Wklej"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto�� schowka"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Wy�lij _list do kontaktu..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "Wysy�a list do wybranych kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send message to contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "Wysy�a zaznaczone kontakty do innej osoby."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-mail-global.xml.h:1 ui/evolution-mail-list.xml.h:1
-#: ui/evolution-mail-message.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "Lista _kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Prze�lij kontakt..."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/my-evolution.xml.h:1
+#: 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:102
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
 msgstr "Z_apisz jako VCard"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
 msgstr "_Szukaj kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "Z_aznacz wszystko"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Konfiguruje ustawienia kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a New All Day _Event"
 msgstr "Stw�rz nowe zdarzenie _ca�odniowe"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a New _Task"
 msgstr "Stw�rz nowe _zadanie"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a _New Appointment"
 msgstr "Stw�rz _nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Tworzy nowe zdarzenie ca�odniowe"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:12
 msgid "Delete the appointment"
 msgstr "Usuwa termin"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "Wstecz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "Naprz�d"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Przejd� do _daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "Przechodzi do dzisiaj"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Miesi�c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nowy termin"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Wy�wietla podgl�d kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "Podgl�d wyd_ruku"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "Drukuje zawarto�� kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Poblikuje informacj� o zaj�to�ci na podstawie tego kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Wy�wietla jeden dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Wy�wietla jeden miesi�c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Wy�wietla jeden tydzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Wy�wietla tydzie� roboczy"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Tydzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "_Termin..."
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Ustawienia kalendarza..."
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informacj� o zaj�to�ci"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:43
 msgid "_Task..."
 msgstr "_Zadanie..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
 msgstr "Zamyka bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Usuwa bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "G��wny pasek narz�dziowy"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
 msgstr "Wy�wietla podgl�d elementu w postaci przygotowanej do druku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Drukuje bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 widgets/misc/e-filter-bar.c:1
+#: 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:239
 msgid "Save"
 msgstr "Zapisz"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Zapisuje element i zamyka okno dialogowe"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Zapisuje bie��cy element na dysku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Wydrukuj _kopert�..."
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: 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..."
 msgstr "Zapisz j_ako..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Usuwa t� list�"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
 msgstr "Usu�..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Zapisuje list� i zamyka okno dialogowe"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "_Wy�lij list� do innej osoby..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Wy�lij _list do listy..."
 
@@ -12888,31 +12912,31 @@ msgstr "Wy�lij _list do listy..."
 msgid "Cancel Mee_ting"
 msgstr "_Anuluj spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Anuluje spotkanie zwi�zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Prze�lij jako i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Przesy�a ten element w li�cie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
 msgstr "_Od�wie� spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "_Zaplanuj spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Planuje spotkanie zwi�zane z tym elementem"
 
@@ -12920,94 +12944,94 @@ msgstr "Planuje spotkanie zwi�zane z tym elementem"
 msgid "Customise My Evolution"
 msgstr "Dopasuj Moje Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Anuluje bie��c� operacj� na listach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Stw�rz _nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 "Pozwala na stworzenie i modyfikacj� kont pocztowych oraz innych ustawie�"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Pozwala na stworzenie lub modyfikacj� regu� filtrowania list�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "Pozwala na stworzenie lub modyfikacj� definicji wirtualnych folder�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Opr�nij �mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "Zapomnij _has�a"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zapomina zapami�tane has�a, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:10
 msgid "New Message"
 msgstr "Nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "Otwiera okno umo�liwiaj�ce napisanie nowego listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia ze wszystkich folder�w"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Wysy�a listy w kolejce i pobiera nowe"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Wy�wietla podgl�d listu w wydzielonej cz�ci okna"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Pozwala za zasubskrybowanie lub odsubskrybowanie folder�w na zdalnych "
 "serwerach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folder�w..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "L_ist"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Ustawienia poczty..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_Podgl�d listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
 msgstr "Su_bskrybcje folder�w..."
 
@@ -13015,110 +13039,110 @@ msgstr "Su_bskrybcje folder�w..."
 msgid "Change the properties of this folder"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopiuje zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Wycina zaznaczone listy do schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ukrycie _zaznaczonych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Ukrycie _usuni�tych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Ukrywanie prz_eczytanych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ukrywa listy oznaczone do usuni�cia, zamiast wy�wietlania ich z "
 "przekre�leniem"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "Oznacz wszystkie jako p_rzeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Wkleja list ze schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia z bie��cego folderu"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Zaznacz w_szystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Zaznacz w�_tek"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Zaznacza wszystkie listy (i tylko te), kt�re obecnie nie s� zaznaczone"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Zaznacza wszystkie listy w bie��cym w�tku"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Zaznacza wszystkie widoczne listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Wy�wietlanie uk_rytych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Wy�wietla listy, kt�re by�y czasowo ukryte"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Czasowo ukrywa listy, kt�re zosta�y przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Czasowo ukrywa zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Prze��cza grupowanie list�w w w�tki"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Odwr�� zaznaczenie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_W�a�ciwo�ci..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Grupowanie list�w w w�t_ki"
 
@@ -13126,378 +13150,378 @@ msgstr "Grupowanie list�w w w�t_ki"
 msgid "Apply filter rules to the selected messages"
 msgstr "Zastosowuje regu�y filtru w odniesieniu do zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Odpowiada wszystkim odbiorcom zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Odpowiada na list� dyskusyjn� zwi�zan� z zaznaczonym listem"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpowiada nadawcy zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Kopiuje zaznaczone listy do innego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Stw�rz _wirtualny folder na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Tworzy regu��, filtruj�c� listy od tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Tworzy regu��, filtruj�c� listy do tych odbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Tworzy regu��, filtruj�c� listy z tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Tworzy regu��, filtruj�c� listy o tym temacie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Tworzy wirtualny folder dla tych odbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Tworzy wirtualny folder dla tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Tworzy wirtualny folder dla tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Tworzy wirtualny folder dla tego tematu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:16
 msgid "Decrease the text size"
 msgstr "Zmniejsza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Wy�wietla kolejny wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Wy�wietla kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Wy�wietla kolejny nieprzeczytany w�tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Wy�wietla poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Wy�wietla poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Wy�wietla poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_st� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawc�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Filtr w oparciu o t_emat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "Wymusza pobranie obraz�w pojawiaj�cych si� w HTML-u"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Prze�lij"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Prze�lij jako"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Prze�lij _za��czony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Prze�lij _wstawiony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Prze�lij z_acytowany"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "Przesy�a zaznaczony list do innej osoby w tre�ci nowego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "Przesy�a zaznaczony list do innej osoby zacytowany jak przy odpowiedzi"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Przesy�a zaznaczony list do innej osoby w postaci za��cznika"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:40
 msgid "Increase the text size"
 msgstr "Zwi�ksza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Oz_nacz jako wa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Oznacza zaznaczone listy jako przeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Oznacza zaznaczone listy jako wa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "Oznacza zaznaczone listy jako niewa�ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Oznacza zaznaczone listy do usuni�cie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Przenie�"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Nast�pny"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Kolejny wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Kolejny w�tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Otwiera zaznaczony list w nowym oknie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Otwiera zaznaczony list w oknie redagowania umo�liwiaj�c jego ponowne "
 "wys�anie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "_Pierwotny rozmiar"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "Wy�wietla podgl�d listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:73
 msgid "Reset the text to its original size"
 msgstr "Przywraca pierwotny rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr "_Przeszukaj list..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_maller"
 msgstr "_Mniejszy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Wyszukuje tekst w tre�ci wy�wietlanego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie��cej drukarki"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Wy�wietlanie postaci �_r�d�owej listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Wy�wietlanie wszystkich _nag��wk�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Wy�wietla list w zwyk�y spos�b"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Wy�wietla list wraz ze wszystkimi nag��wkami"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "Wy�wietla list w surowej, �r�d�owej postaci"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:84
 msgid "Text Si_ze"
 msgstr "_Rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usuni�cia dla wszystkich zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _list� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawc�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "_Stw�rz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "_Prze�lij list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Larger"
 msgstr "_Wi�kszy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "P_rzenie� do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "_Zwyk�e wy�wietlanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "_Otw�rz list"
 
-#: ui/evolution-mail-message.xml.h:1 ui/evolution.xml.h:1
-#: ui/my-evolution.xml.h:1
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zamyka bie��ce okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Widok"
 
@@ -13505,185 +13529,185 @@ msgstr "_Widok"
 msgid "Attach"
 msgstr "Za��cz"
 
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zamyka bie��cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Szyfruje list przy u�yciu PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Szyfruje list za pomoc� cerftyfikatu szyfruj�cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:8
 msgid "For_mat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:10
 msgid "Inline Text _File..."
 msgstr "Plik te_kstowy..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Wstawia zawarto�� pliku jako tekst do listu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Szyfrowanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Zapisz _szkic"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Zapisuje bie��cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bie��cy plik pod inn� nazw�"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Wy�lij"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Wy�lij p�_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Wy�lij p�_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Okre�la, czy list powinien zosta� wys�any w formacie HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Wysy�a list p�niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Wysy�a list natychmiast"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Wy�wietla / ukrywa za��czniki"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Wy�wietlanie _za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Prze��cza wy�wietlanie za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Podpisuje list za pomoc� klucza PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpisuje list za pomoc� certyfikatu podpisuj�cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola BCC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola CC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prze��cza wy�wietlanie listy wyboru w polu Od"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prze��cza wy�wietlanie pola Odpowied� do (Reply-To)"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Attachment..."
 msgstr "_Za��cznik..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Delete all"
 msgstr "_Usu� wszystko"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "W_staw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Otw�rz..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Bezpiecze�stwo"
 
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -13691,27 +13715,27 @@ msgstr "Pomo_c"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaje folder do listy zasubskrybowanych folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Folder"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Od�wie� list�"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Od�wie�a list� folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Usuwa folder z listy zasubskrybowanych folder�w"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Zapisz"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
@@ -13719,51 +13743,51 @@ msgstr "Wypisz"
 msgid "Assign Task"
 msgstr "Przypisz zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:2
 msgid "Assign this task to others"
 msgstr "Przypisuje zadanie innej osobie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:4
 msgid "Cancel this task"
 msgstr "Anuluje zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
 msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "_Od�wie� zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:2
 msgid "Configure the task view's settings"
 msgstr "Konfiguruje ustawienia widoku zadania"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:13
 msgid "Tasks Settings..."
 msgstr "Ustawienia zada�..."
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "_Zadanie"
 
@@ -13771,152 +13795,152 @@ msgstr "_Zadanie"
 msgid "About Ximian Evolution..."
 msgstr "Informacje o Ximian Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
 msgstr "Dodaj do paska _skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:3
 msgid "Change the name of this folder"
 msgstr "Zmienia nazw� folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopiuje folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Stw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Tworzy na pasku skr�t�w odno�nik do bie��cego folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Tworzy nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Wy�wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Zako�cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:13
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Ko�czy prac� programu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "Import danych z innych program�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:18
 msgid "Open in New Window"
 msgstr "Otw�rz w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:21
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o Ximian Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Prze��cza pomi�dzy trybami pracy z pod��czeniem i bez pod��czenia do sieci."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:31
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:32
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o Ximian Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:41
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:45
 msgid "_Pilot Settings..."
 msgstr "_Ustawienia pilota..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Skr�t"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
@@ -13924,19 +13948,19 @@ msgstr "Pasek _skr�t�w"
 msgid "Change the settings for the summary"
 msgstr "Zmienia ustawienia zestawienia"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:4
 msgid "Print summary"
 msgstr "Wydrukuj zestawienie"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:5
 msgid "Reload"
 msgstr "Od�wie�"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr "Od�wie�a widok"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:8
 msgid "_Summary Settings..."
 msgstr "_Ustawienia zestawienia..."
 
@@ -13944,11 +13968,11 @@ msgstr "_Ustawienia zestawienia..."
 msgid "Address Cards"
 msgstr "Karty adresowe"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
 msgid "By Company"
 msgstr "Wed�ug firmy"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:3
 msgid "Phone List"
 msgstr "Lista telefon�w"
 
@@ -13956,19 +13980,19 @@ msgstr "Lista telefon�w"
 msgid "By Sender"
 msgstr "Wed�ug nadawcy"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:2
 msgid "By Status"
 msgstr "Wed�ug stanu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
 msgid "By Subject"
 msgstr "Wed�ug tematu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:4
 msgid "Messages"
 msgstr "Listy"
 
-#: views/tasks/galview.xml.h:1
+#: views/tasks/galview.xml.h:2
 msgid "With Category"
 msgstr "Wraz z kategoriami"
 
@@ -13976,15 +14000,15 @@ msgstr "Wraz z kategoriami"
 msgid "Select a Time Zone"
 msgstr "Wyb�r strefy czasowej"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "Selection:"
 msgstr "Wyb�r:"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
 msgstr "Strefy czasowe"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -13994,165 +14018,165 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Zdefiniuj widoki"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PW�CPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Dzi�"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Czas musi by� podany w formacie: %s"
 
-#: widgets/misc/e-cell-percent.c:1
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto�� procentowa musi si� zawiera� w przedziale od 0 do 100 w��cznie"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Ba�tycki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "�rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chi�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japo�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Korea�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrai�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nowy"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Podaj wykorzystywany zestaw znak�w"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Standard kodowania znak�w"
 
-#: widgets/misc/e-clipped-label.c:1
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Edytor wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Dodaj do zapisanych wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Wy�wietl wszystkie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacje"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "B��d"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pytanie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "List"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Wy_szukiwanie"
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -14161,19 +14185,19 @@ msgstr "Znajd�"
 msgid "The Personal Addressbook Server"
 msgstr "Osobisty serwer ksi��ki adresowej"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Osobisty serwer ksi��ki adresowej; generator kalendarza"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
diff --git a/po/pt.po b/po/pt.po
index 19e86154fa..68d0eb3d8f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago Ant�o <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr ""
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -21,502 +29,507 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 #, fuzzy
 msgid "File As"
 msgstr "_Pasta"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Name"
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 #, fuzzy
 msgid "Email"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prim�rio"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Prim�rio"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Ocupado"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organiza��o"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Telem�vel"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Carro"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ocupado"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Casa 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "RDIS"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Bip"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Correio 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Correio electr�nico 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Department"
 msgstr "Data"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escrit�rio"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Fora do escrit�rio"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Segunda-feira"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Novo Ca_lend�rio"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr "Hora de �n_icio de encontro"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Nome completo:"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 #, fuzzy
 msgid "Card: "
 msgstr "Carro"
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Endere�o"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -532,23 +545,23 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -557,87 +570,89 @@ 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Ano"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Imprimir calend�rio"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "Criar um novo calend�rio"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -685,46 +700,46 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr "Pressione aqui para o livro de endere�os"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "_Contacto"
@@ -764,7 +779,7 @@ msgid "Base"
 msgstr "Colar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "Colar"
@@ -851,17 +866,17 @@ msgstr "�cone_s pequenos"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Edit"
@@ -881,23 +896,29 @@ msgstr "Prioridade:"
 msgid "_Server name:"
 msgstr "Encontrar mensagens"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 #, fuzzy
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -905,52 +926,52 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 #, fuzzy
 msgid "Email contains"
 msgstr "�cone_s pequenos"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "�cone_s pequenos"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrar�"
 
@@ -964,55 +985,55 @@ msgstr "O URI que o navegador de pastas mostrar�"
 msgid "(none)"
 msgstr "Nome"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Endere�o principal de correio electr�nico"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "Apagar um contacto"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Criar um novo contacto"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Endere�o de correio:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
@@ -1024,53 +1045,62 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Remover"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 #, fuzzy
 msgid "Remove All"
 msgstr "Remover"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Enviar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:532
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1136,13 +1166,13 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
@@ -1214,9 +1244,9 @@ msgstr "_Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
@@ -1290,40 +1320,50 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Apagar um contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 #, fuzzy
 msgid "Edit Full"
 msgstr "_Pastas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 #, fuzzy
 msgid "E-mail"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Pr�_ximo"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2461,7 +2501,7 @@ msgid "contact-list-editor"
 msgstr "_Contacto"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_Contacto"
@@ -2511,156 +2551,163 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Adicionar..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 #, fuzzy
 msgid "Search"
 msgstr "Ano"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segundos"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Enviar esta mensagem"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimir..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 msgid "Success"
 msgstr "Fontes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "Ficheiro n�o encontrado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "Outro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
@@ -2668,7 +2715,7 @@ msgstr "Erro a gravar os atalhos."
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2676,85 +2723,94 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Prim�rio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 #, fuzzy
 msgid "Business Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Home Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Telem�vel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Other Phone"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 #, fuzzy
 msgid "Other Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2964,106 +3020,120 @@ msgstr ""
 msgid "_Font..."
 msgstr "Imprimir..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Imprimir..."
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 #, fuzzy
 msgid "High"
 msgstr "Cabe�alhos:"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
@@ -3076,47 +3146,30 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: 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:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr ""
-
-#: 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:165
-msgid "Notification about your appointment"
-msgstr ""
-
-#: 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:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Segundos"
 
-#: 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:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Cabe�alhos:"
 
-#: 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:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarmes"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3138,12 +3191,12 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 #, fuzzy
 msgid "No description available."
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3151,7 +3204,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3162,197 +3215,181 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "Could not create the alarm notify service"
+msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr ""
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 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:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Semana"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 #, fuzzy
 msgid "Not Started"
 msgstr "_Come�ando"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 #, fuzzy
 msgid "Completed"
 msgstr "Cores"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Nenhuma"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 #, fuzzy
 msgid "No"
 msgstr "Novo"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Ano"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "_Novo"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "Semana"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "Semana"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "Month View"
 msgstr "M�s"
@@ -3372,12 +3409,12 @@ msgstr "Nenhuma descri��o"
 msgid "Comment contains"
 msgstr "Assunto"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lend�rio"
@@ -3387,9 +3424,9 @@ msgstr "Novo Ca_lend�rio"
 msgid "Folder containing appointments and events"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
@@ -3400,28 +3437,28 @@ msgstr "_Tarefa"
 msgid "Folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso para hoje"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "O URI que o calend�rio mostrar�"
 
@@ -3497,52 +3534,52 @@ msgstr "Horas"
 msgid "minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "DiasRascunhos"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr "Semana"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 #, fuzzy
 msgid "1 minute"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr " segundos"
@@ -3602,17 +3639,12 @@ msgstr "_Editar Compromisso"
 msgid "%s at the end of the appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, c-format
-msgid "%s at an unknown time"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s%s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3635,7 +3667,7 @@ msgstr "Enviar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -3671,7 +3703,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -3734,7 +3766,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
@@ -3748,7 +3780,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -3757,7 +3789,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
@@ -3782,7 +3814,7 @@ msgid "Su_n"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3801,7 +3833,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 #, fuzzy
 msgid "Thursday"
 msgstr "Hoje"
@@ -3826,13 +3858,13 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 #, fuzzy
 msgid "Tuesday"
 msgstr "Hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr ""
 
@@ -3914,169 +3946,174 @@ msgstr "Qua"
 msgid "before the start of the appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 #, fuzzy
 msgid " to "
 msgstr "Ir para"
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4096,29 +4133,29 @@ msgstr "Apagar"
 msgid "Enter Delegate"
 msgstr "Apagar"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 #, fuzzy
 msgid "Appointment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 #, fuzzy
 msgid "Reminder"
 msgstr "Enviar"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 #, fuzzy
 msgid "Recurrence"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Fontes"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "Seg"
@@ -4139,11 +4176,12 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "Data"
@@ -4154,13 +4192,13 @@ msgid "F_ree"
 msgstr "Semana"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Activar"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr ""
 
@@ -4171,7 +4209,7 @@ msgid "Show Time As"
 msgstr "Horas"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Sum�rio:"
@@ -4186,32 +4224,19 @@ msgstr "Hora de _fim de _encontro"
 msgid "_Start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Apagar"
@@ -4256,6 +4281,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4276,7 +4302,7 @@ msgstr "S�b"
 
 #: 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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4292,7 +4318,8 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4303,27 +4330,27 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 #, fuzzy
 msgid "on"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "on the"
 msgstr "M�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 #, fuzzy
 msgid "th"
 msgstr "h"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurr�ncias"
@@ -4401,19 +4428,15 @@ msgstr "Semanas"
 msgid "year(s)"
 msgstr "Ano"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4433,7 +4456,7 @@ msgid "Progress"
 msgstr "Propriedades do alarme"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr ""
 
@@ -4447,149 +4470,177 @@ msgstr "Prioridade:"
 msgid "_Status:"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 #, fuzzy
 msgid "Description:"
 msgstr "Nenhuma descri��o"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 #, fuzzy
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Cortar"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "Copiar"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "Colar"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Pressione aqui para o livro de endere�os"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "Cores"
@@ -4623,8 +4674,8 @@ msgstr "Hora de �n_icio de encontro"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 #, fuzzy
 msgid "Summary"
 msgstr "Sum�rio"
@@ -4638,337 +4689,416 @@ msgstr "Lista de tarefas"
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir para a _pasta..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Cores"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Nenhuma Informa��o"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+msgid "An unknown person"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Nenhuma descri��o"
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "�cone_s pequenos"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Receber"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Pedido de _encontro"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Mensagens enviadas"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "_Tarefa"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Pedido de tarefa"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Responder"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5014,201 +5144,223 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Grupo %i"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Fontes"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 #, fuzzy
 msgid "Chair"
 msgstr "Carro"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 #, fuzzy
 msgid "Required Participant"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Remover grupo"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "Receber"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Apagar"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Fora do escrit�rio"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Op��es"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Abrir ficheiro"
+
+#: calendar/gui/e-tasks.c:355
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Abrir calend�rio"
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -5271,238 +5423,282 @@ msgstr "Outro"
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26�"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27�"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28�"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29�"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30�"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31�"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "M�s corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "S�b"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Prioridade:"
+
+#: calendar/gui/print.c:2294
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "�cone_s pequenos"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Contacto"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Prever impress�o"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimir este item"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 #, fuzzy
 msgid "Print Setup"
 msgstr "Imprimir..."
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que o calend�rio mostrar�"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5510,125 +5706,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5652,7 +5848,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5660,7 +5856,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5668,109 +5864,109 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5779,187 +5975,187 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Criar um novo calend�rio"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -5979,7 +6175,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -5989,13 +6185,13 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calend�rio"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6094,7 +6290,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -6112,8 +6308,8 @@ msgid "Unknown authentication state."
 msgstr "Autentica��o"
 
 #: 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Password"
 msgstr "Esquecer _Senhas"
@@ -6144,55 +6340,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6237,17 +6433,17 @@ msgstr "Anexar um ficheiro � mensagem"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6255,7 +6451,7 @@ msgid ""
 msgstr "Assunto"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6265,7 +6461,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6277,37 +6473,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -6340,59 +6536,59 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enviar uma nova mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Criar um novo calend�rio"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Verificar novo correio"
@@ -6402,7 +6598,7 @@ msgstr "Verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novo correio"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "_Pastas"
 
@@ -6435,28 +6631,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6464,90 +6660,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "_Pastas"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
+#: camel/providers/local/camel-local-provider.c:68
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6558,78 +6756,83 @@ msgid "Could not save summary: %s: %s"
 msgstr "Criar um novo calend�rio"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Enviar esta mensagem"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6644,171 +6847,184 @@ msgstr "Criar um novo calend�rio"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Abrir calend�rio"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Enviar mensagem em formato HTML"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -6818,462 +7034,445 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Sincronizar"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Criar um novo calend�rio"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Ficheiro n�o encontrado"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "Situa��o das mensagens"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Apagar este item"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, fuzzy
 msgid "Help message"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Service ready"
 msgstr "Servidor:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7281,170 +7480,170 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
@@ -7478,14 +7677,14 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -7493,7 +7692,7 @@ msgstr "De"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Responder"
@@ -7501,31 +7700,31 @@ msgstr "Responder"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que ir�o receber uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7538,120 +7737,128 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Enviar esta mensagem"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "_Inserir"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7710,15 +7917,24 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
@@ -7769,30 +7985,30 @@ msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7933,23 +8149,23 @@ msgstr "Qi"
 msgid "Add action"
 msgstr "_Ac��es"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7964,41 +8180,41 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem t�tulo)"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -8210,7 +8426,7 @@ msgstr "Reponder para todos"
 msgid "Score"
 msgstr "Fontes"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 #, fuzzy
 msgid "Sender"
 msgstr "Enviar"
@@ -8246,7 +8462,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assunto"
@@ -8259,17 +8475,17 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 #, fuzzy
 msgid "Add Rule"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Adicionar Fonte"
@@ -8279,103 +8495,98 @@ msgstr "Adicionar Fonte"
 msgid "Score Rules"
 msgstr "Fontes"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Seg"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Seg"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sincronizar"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "_Correio"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Calend�rio do Gnome"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 #, fuzzy
 msgid "Settings"
 msgstr "Segundos"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimir"
@@ -8419,270 +8630,275 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 msgid "Mail configuration interface"
 msgstr "Configura��o do correio"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 #, fuzzy
 msgid "This folder cannot contain messages."
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "Propriedades do alarme"
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segundos"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gravar na _pasta..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Undelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Apagar"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8706,37 +8922,47 @@ msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
+msgid "Body contents"
+msgstr "_Ac��es"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
 msgid "Current store format:"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "�nd_ice de ajuda"
+
+#: mail/local-config.glade.h:4
 #, fuzzy
 msgid "Mailbox Format"
 msgstr "F_ormato"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 #, fuzzy
 msgid "New store format:"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 #, fuzzy
 msgid "maildir"
 msgstr "Correio electr�nico 2"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 #, fuzzy
 msgid "mbox"
 msgstr "Correio novo"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 #, fuzzy
 msgid "mh"
 msgstr "h"
@@ -8757,24 +8983,24 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 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:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8792,54 +9018,54 @@ msgstr "Como _Tabela"
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Configura��o do co_rreio..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Fontes de correio"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assunto"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8847,127 +9073,127 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "Seg"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8975,33 +9201,33 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9043,17 +9269,17 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9064,16 +9290,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "Correio novo"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -9091,34 +9317,34 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Accounts"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9133,28 +9359,24 @@ msgstr "Autentica��o"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Authentication Type: "
-msgstr "Autentica��o"
+msgid "Checking for New Mail"
+msgstr "Verificar novo correio"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 msgid "Confirm when Expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9164,372 +9386,396 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "De_fault"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Display"
 msgstr "Dia"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 #, fuzzy
 msgid "Drafts"
 msgstr "Data"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Drafts folder:"
-msgstr "Criar um novo calend�rio"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Edit..."
 msgstr "Imprimir..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "F_ormato"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "News"
 msgstr "Novo"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Mudar nome de atalho"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 #, fuzzy
 msgid "Sent"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 #, fuzzy
-msgid "Sent and Draft Messages"
+msgid "Sent _messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
-msgid "Sent messages folder:"
+msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Autentica��o"
+
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server Type: "
+msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:80
-#, fuzzy
-msgid "Server requires _authentication"
-msgstr "Autentica��o"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "_Pastas"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Autentica��o"
+
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr "Verificar novo correio"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Criar um novo calend�rio"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Endere�o de correio:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "Horas"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organiza��o:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Caminho"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Enviar mensagem em formato HTML"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Utilizador:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Remover"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "seconds."
 msgstr " segundos"
@@ -9579,240 +9825,213 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "�brir em nova janela"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr ""
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1397
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Enviar a mensagem"
-
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, 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:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Nova pasta"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Esquecer _Senhas"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 #, fuzzy
 msgid "Working"
 msgstr "Seg"
@@ -9822,162 +10041,157 @@ msgstr "Seg"
 msgid "Filtering Folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Enviar"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 #, fuzzy
 msgid "Complete."
 msgstr "Cores"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Criar um novo calend�rio"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 #, fuzzy
 msgid "Trash"
 msgstr "_Tarefa"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Anexo"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Abrir ficheiro"
@@ -9987,107 +10201,117 @@ msgstr "Abrir ficheiro"
 msgid "_Search"
 msgstr "Ano"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "(Sem t�tulo)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "Mensagem de _correio"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "Ano"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Find:"
 msgstr "Encontrar"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "Caminho"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Para:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Receber"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Novo Ca_lend�rio"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Esquecer _Senhas"
+
+#: mail/mail-tools.c:248
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Abrir ficheiro"
@@ -10097,7 +10321,7 @@ msgstr "Abrir ficheiro"
 msgid "Updating vfolders for uri: %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10106,32 +10330,32 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assunto"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mensagem de _correio"
@@ -10197,7 +10421,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "Encontrar mensagens"
@@ -10226,28 +10450,28 @@ msgstr "Encontrar mensagens"
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_Pastas"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10293,134 +10517,128 @@ msgstr "Fontes"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
+msgid "Cannot initialize Evolution's Summary component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "Compromissos:"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "Compromisso - %s"
 
-#: my-evolution/e-summary-calendar.c:364
-msgid "%k%M %d %B"
+#: my-evolution/e-summary-calendar.c:377
+msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "Nenhum sum�rio"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Segundos"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Erro a gravar os atalhos."
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidor:"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Outro"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "Segundos"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Sum�rio"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Component de correio: N�o consegui inicializar Bonobo"
@@ -10482,7 +10700,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10562,1072 +10780,1072 @@ msgstr "_Nota"
 msgid "North - Northwest"
 msgstr ""
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "Horas"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 #, fuzzy
 msgid "Snow"
 msgstr "Tamanho"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "_Correio"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "Endere�o principal de correio electr�nico"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 #, fuzzy
 msgid "Thick mist"
 msgstr "Lista de tarefas"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "Prioridade"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "Fontes"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Ver _anexos"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "Enviar"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Ano"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "DiasRascunhos"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Mensagem de _correio"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Ver _anexos"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Prioridade"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11638,7 +11856,7 @@ msgstr "Remover"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Adicionar novo grupo"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11656,12 +11874,12 @@ msgstr "_Pastas"
 msgid "All news _feeds:"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11706,14 +11924,14 @@ msgid "Show _today's tasks"
 msgstr "Ver _anexos"
 
 #: my-evolution/my-evolution.glade.h:18
+msgid "Show temperatures in:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Tasks "
 msgstr "_Tarefa"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr ""
-
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr ""
@@ -11734,14 +11952,13 @@ msgid "_Displayed feeds:"
 msgstr "Dia"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_Five days"
-msgstr "Sex"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "_Imperial"
-msgstr "_Correio"
+msgid "_Five days"
+msgstr "Sex"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -11781,43 +11998,43 @@ msgstr "Ver _anexos"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 #, fuzzy
 msgid "Inbox"
 msgstr "Correio novo"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 #, fuzzy
 msgid "Outbox"
 msgstr "Correio novo"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Pastas"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instala��o do Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 #, fuzzy
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11825,14 +12042,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11840,7 +12057,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11849,7 +12066,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11857,6 +12074,20 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
@@ -11869,61 +12100,67 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Apagar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Abrir ficheiro"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
@@ -11931,54 +12168,31 @@ msgid ""
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "(Nenhuma pasta mostrada)"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "Criar um novo calend�rio"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "O Evolution n�o consegue criar as suas pastas locais"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Sem t�tulo)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11987,13 +12201,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12001,194 +12215,204 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 #, fuzzy
 msgid "Importing"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 #, fuzzy
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 #, fuzzy
 msgid "Select folder"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "(Nenhuma pasta mostrada)"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Uma pasta contendo items de correio"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "O Bug buddy n�o foi encontrado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "N�o consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "About Ximian Evolution"
 msgstr "Evolution"
 
-#: 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: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:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Seg"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
@@ -12197,46 +12421,36 @@ msgstr "Seg"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "Nome"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "Evolution - %s"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12244,233 +12458,334 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 #, fuzzy
 msgid "_Small Icons"
 msgstr "�cone_s pequenos"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 #, fuzzy
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co �cones grandes"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "�brir em nova janela"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Remover"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 #, fuzzy
 msgid "(No name)"
 msgstr "Nome"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "N�o consigo abrir a localiza��o: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "Outro"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+msgid "Invalid argument"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Nenhuma"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Ficheiro n�o encontrado"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Transporte de correio"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Nenhuma Informa��o"
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Outro"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "Pr�_ximo"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Novo Ca_lend�rio"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Enviar a mensagem"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Situa��o das mensagens"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12574,72 +12889,70 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr ""
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr ""
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution"
 
-#: shell/main.c:162
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:183
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializa��o do sistema de componentes Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Erro a gravar os atalhos."
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Abrir ficheiro"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "_Inserir"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "(Nenhuma pasta mostrada)"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12745,7 +13058,7 @@ msgstr "Cabe�alhos:"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Ac��es"
@@ -12771,7 +13084,7 @@ msgid "_Forward Contact..."
 msgstr "_Contacto"
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
@@ -12826,7 +13139,7 @@ msgstr "DiasRascunhos"
 msgid "Delete the appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Go To"
 msgstr "Ir para"
@@ -12969,12 +13282,13 @@ msgstr "Imprimir..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 #, fuzzy
 msgid "Save"
 msgstr "S�"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save and Close"
 msgstr "Guardar Calend�rio como"
@@ -12991,7 +13305,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_File"
@@ -13016,7 +13330,7 @@ msgstr ""
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "S�"
@@ -13083,10 +13397,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "Evolution - %s"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13373,326 +13683,355 @@ msgstr ""
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward As"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+msgid "Increase the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Move"
 msgstr "Sg"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Next"
 msgstr "Pr�_ximo"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "Reponder para todos"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Enviar a mensagem"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Previous"
 msgstr "An_terior"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "atalhos principais"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Novas mensagens de correio"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Dru�da dos _filtros"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Bip"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Dia"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -13704,7 +14043,7 @@ msgstr "Novo compromisso"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
@@ -13740,11 +14079,12 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "F_ormato"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13796,7 +14136,7 @@ msgid "Save in folder..."
 msgstr "Gravar na _pasta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 #, fuzzy
 msgid "Save the current file"
 msgstr "Ficheiro com assinatura:"
@@ -13906,7 +14246,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -13924,7 +14264,7 @@ msgstr "Responder"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
@@ -14196,11 +14536,6 @@ msgstr "Mudar nome de atalho"
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Work Offline"
-msgstr "Seg"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr ""
@@ -14284,141 +14619,145 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 #, fuzzy
 msgid "_Current View"
 msgstr "Ano corrente (%Y)"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 #, fuzzy
 msgid "Now"
 msgstr "Novo"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Hoje"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "Semana"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "_Op��es"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Novo"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "Outro"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "_Contacto"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 #, fuzzy
 msgid "Save Search"
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr ""
 
@@ -14467,22 +14806,73 @@ msgstr "Adicionar Fonte"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Nenhuma descri��o"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Sincronizar"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Criar um novo calend�rio"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Calend�rio do Gnome"
+
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Enviar a mensagem"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Criar um novo calend�rio"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "_Correio"
+
+#, fuzzy
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Criar um novo calend�rio"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "Evolution - %s"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormato"
+
+#, fuzzy
 #~ msgid "LDAP Authentication"
 #~ msgstr "Autentica��o"
 
@@ -14491,10 +14881,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Esquecer _Senhas"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "Nenhuma Informa��o"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "Novo compromisso"
 
@@ -14609,10 +14995,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Endere�o principal de correio electr�nico"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Enviar esta mensagem"
 
@@ -14681,14 +15063,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Items seleccionados"
 
 #, fuzzy
-#~ msgid "No one"
-#~ msgstr "Nenhuma"
-
-#, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
 #~ msgid "Transparency"
 #~ msgstr "Transportes"
 
@@ -14794,10 +15168,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "�nd_ice de ajuda"
-
-#, fuzzy
 #~ msgid "_Mail message"
 #~ msgstr "Mensagem de _correio"
 
@@ -14865,9 +15235,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Atalho para _barra do Evolution"
 
-#~ msgid "Open calendar"
-#~ msgstr "Abrir calend�rio"
-
 #~ msgid "Save calendar"
 #~ msgstr "Gravar calend�rio"
 
@@ -15045,10 +15412,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Mail source type:"
 #~ msgstr "Fontes de correio"
 
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Transporte de correio"
-
 #~ msgid "Add Source"
 #~ msgstr "Adicionar Fonte"
 
@@ -15131,9 +15494,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Mostrar a barra de pastas"
 
-#~ msgid "Headings:"
-#~ msgstr "Cabe�alhos:"
-
 #, fuzzy
 #~ msgid "sunday"
 #~ msgstr "Domingo"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b356f84a1b..06447ec10c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.17\n"
-"POT-Creation-Date: 2001-10-30 07:52-0500\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-31 10:19-02:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -613,9 +613,9 @@ 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:1539
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1452
+#: calendar/conduits/calendar/calendar-conduit.c:1449
 #: calendar/conduits/todo/todo-conduit.c:1128
 #: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
@@ -677,20 +677,20 @@ msgstr "N�o foi poss�vel carregar cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook n�o foi carregado\n"
 
-#: addressbook/conduit/address-conduit.c:1095
-#: calendar/conduits/calendar/calendar-conduit.c:984
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
 #: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "N�o foi poss�vel iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1096
-#: calendar/conduits/calendar/calendar-conduit.c:985
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
 #: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "N�o foi poss�vel iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:1126
-#: addressbook/conduit/address-conduit.c:1129
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "N�o foi poss�vel ler os dados do aplicativo de endere�os do pilot"
 
@@ -736,8 +736,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o controle do Cat�logo de Endere�os exemplo"
 
 #: addressbook/gui/component/addressbook-component.c:71
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-local-storage.c:172
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 #: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contatos"
@@ -899,7 +899,7 @@ msgstr "_Adicionar"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
@@ -984,8 +984,8 @@ msgid "Category is"
 msgstr "Categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avan�ado..."
 
@@ -1065,7 +1065,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "F�brica para interface para sele��o de nomes do cat�logo de endere�os"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:772
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
 #: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
@@ -1106,8 +1106,8 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
-"Isto pode ter sido causado por uma falha no componente "
-"evolution-addressbook.\n"
+"Isto pode ter sido causado por uma falha no componente evolution-"
+"addressbook.\n"
 "Para nos ajudar a entender melhor este problema e finalmente resolv�-lo,\n"
 "por favor envie um e-mail para Jon Trowbridge <trow@ximian.com> com uma\n"
 "descri��o detalhada das circunst�ncias sob as quais este erro ocorreu.\n"
@@ -1260,7 +1260,7 @@ msgstr "Co_ntatos..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:700 filter/filter.glade.h:8
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
 #: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
@@ -2487,7 +2487,7 @@ msgstr ""
 "pasta. Voc� deseja adicion�-lo mesmo assim?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Busca avan�ada"
 
@@ -2563,13 +2563,13 @@ msgid "Error modifying card"
 msgstr "Erro ao modificar cart�o"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:971
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2578,7 +2578,7 @@ msgid "Repository offline"
 msgstr "Reposit�rio off-line"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Permiss�o negada"
 
@@ -2595,7 +2595,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo n�o suportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:40
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
 #: camel/camel-service.c:607 camel/camel-service.c:643
@@ -2920,6 +2920,11 @@ msgstr "Imprimir cart�o"
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Editar compromisso"
+
 #: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
@@ -2927,7 +2932,7 @@ msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
-#: calendar/gui/calendar-model.c:1684
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
@@ -2946,13 +2951,13 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: calendar/conduits/calendar/calendar-conduit.c:938
+#: calendar/conduits/calendar/calendar-conduit.c:935
 #: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao comunicar com o servidor de agenda"
 
+#: calendar/conduits/calendar/calendar-conduit.c:1075
 #: calendar/conduits/calendar/calendar-conduit.c:1078
-#: calendar/conduits/calendar/calendar-conduit.c:1081
 msgid "Could not read pilot's Calendar application block"
 msgstr "N�o foi poss�vel ler os dados do aplicativo de agenda do pilot"
 
@@ -3096,48 +3101,48 @@ msgstr "N�o foi poss�vel criar o servi�o de notifica��o de alarme"
 msgid "Could not create the alarm notify service factory"
 msgstr "N�o foi poss�vel criar a f�brica de servi�o de notifica��o de alarme"
 
-#: calendar/gui/calendar-commands.c:438
+#: calendar/gui/calendar-commands.c:446
 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:441 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
 #: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 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:466
+#: calendar/gui/calendar-commands.c:474
 #: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:676
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "N�o foi poss�vel criar a vis�o da agenda. Por favor verifique a configura��o "
 "do seu ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
 #: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
 #: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3146,52 +3151,53 @@ msgstr "Confidencial"
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1130
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
 #: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:458
-#: calendar/gui/e-meeting-time-sel.c:409 shell/evolution-shell-component.c:993
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "N�o iniciada"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Em progresso"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Conclu�da"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3202,37 +3208,37 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1172 calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1686
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: calendar/gui/calendar-model.c:1688
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1694 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:730
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1694 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:731
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "N�o"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1947 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Buscando"
@@ -3310,23 +3316,23 @@ msgstr "Nova _tarefa"
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Op��es do alarme aud�vel"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Op��es do alarme de mensagem"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Op��es do alarme de correio"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Op��es do alarme de programa"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Op��es do alarme desconhecido"
 
@@ -3801,23 +3807,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Voc� n�o fez altera��es, atualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Conclu�da "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Conclu�da "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Prazo "
 
@@ -3825,35 +3831,35 @@ msgstr "Prazo "
 msgid "Could not update object!"
 msgstr "N�o foi poss�vel atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:671
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:676
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:679
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de di�rio - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:696
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1054 mail/mail-callbacks.c:1876
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1058 mail/mail-callbacks.c:1883
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3862,12 +3868,12 @@ msgstr ""
 "J� existe um arquivo com este nome.\n"
 "Sobrescrev�-lo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1104 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1265
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "N�o foi poss�vel obter a vers�o atual!"
 
@@ -4007,11 +4013,16 @@ msgstr "Hora de _in�cio:"
 msgid "An organizer is required."
 msgstr "Um organizador � exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:622
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Pelo menos um participante � necess�rio"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Esta pessoa j� participa da reuni�o!"
 
-#: calendar/gui/dialogs/meeting-page.c:695
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4204,7 +4215,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4339,7 +4350,7 @@ msgstr "_Marcar tarefas como conclu�das"
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7031
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
 #: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "Atualizando objetos"
@@ -4350,18 +4361,18 @@ msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:119 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:122 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:127
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4376,8 +4387,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:720
-#: camel/camel-filter-driver.c:836
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Conclu�da"
 
@@ -4409,7 +4420,7 @@ msgstr "Data de in�cio"
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4842,96 +4853,96 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: calendar/gui/e-meeting-model.c:92
+#: calendar/gui/e-meeting-model.c:94
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-model.c:93 calendar/gui/e-meeting-model.c:1422
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
 msgid "Required Participants"
 msgstr "Participantes obrigat�rios"
 
-#: calendar/gui/e-meeting-model.c:94
+#: calendar/gui/e-meeting-model.c:96
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:97
 msgid "Non-Participants"
 msgstr "N�o participantes"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:698
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Indiv�duo"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:699
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:700
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:701
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354 calendar/gui/e-meeting-model.c:702
-#: calendar/gui/e-meeting-model.c:718
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
 #: camel/providers/smtp/camel-smtp-transport.c:222
 #: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:714
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Moderador"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:715
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Participante obrigat�rio"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "N�o participante"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:743
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Necessita a��o"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#: calendar/gui/e-meeting-model.c:744
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:745
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:746 calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:747
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Em andamento"
 
@@ -4946,14 +4957,14 @@ msgstr "%A, %d de %B, %Y"
 #. 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:2053 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:1582
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5036,17 +5047,17 @@ msgstr "O m�todo necess�rio para carregar `%s' n�o � suportado"
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/gnome-cal.c:1315
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "N�o foi poss�vel abrir pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:1326
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo necess�rio para abrir `%s' n�o � suportado"
 
-#: calendar/gui/gnome-cal.c:1681
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
@@ -5366,7 +5377,9 @@ msgstr "A URI da pasta de tarefas a ser exibida"
 #: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "N�o foi poss�vel criar a vis�o de tarefas. Por favor verifique a configura��o do seu ORBit e OAF."
+msgstr ""
+"N�o foi poss�vel criar a vis�o de tarefas. Por favor verifique a "
+"configura��o do seu ORBit e OAF."
 
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
@@ -5484,8 +5497,8 @@ msgstr "contains? espera que o argument 2 seja uma string"
 
 #: calendar/pcs/query.c:679
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que o argument 1 seja um de \"any\", \"summary\", "
 "\"description\""
@@ -5572,48 +5585,48 @@ msgstr "Voc� deve estar trabalhando conectado para completar esta opera��o"
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:661
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "N�o � poss�vel abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:670
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "N�o � poss�vel processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:685
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:690
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:920
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:926
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
@@ -5673,22 +5686,22 @@ msgstr "Executando consulta por cabe�alho desconhecido: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido em corpo-cont�m, esperado string"
 
-#: camel/camel-lock-client.c:109
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "N�o � poss�vel criar pipe de bloqueio auxiliar: %s"
 
-#: camel/camel-lock-client.c:122
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "N�o � poss�vel executar fork para o auxiliar de bloqueio: %s"
 
-#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "N�o foi poss�vel bloquear '%s': erro de protocolo com lock-helper"
 
-#: camel/camel-lock-client.c:211
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "N�o foi poss�vel bloquear '%s'"
@@ -5793,8 +5806,8 @@ msgstr "N�o � poss�vel assinar esta mensagem: n�o foi fornecida uma senha"
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
-"N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
+"N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
+"PGP: %s"
 
 #: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
@@ -5811,8 +5824,8 @@ msgstr ""
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
-"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
+"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
+"PGP: %s"
 
 #: camel/camel-pgp-context.c:956
 #, c-format
@@ -5834,8 +5847,8 @@ msgstr "N�o � poss�vel cifrar esta mensagem: n�o foi fornecida uma senha"
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
-"N�o � poss�vel cifrar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
+"N�o � poss�vel cifrar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
+"PGP: %s"
 
 #: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
@@ -5854,8 +5867,8 @@ msgstr "N�o � poss�vel decifrar esta mensagem: n�o foi fornecida uma senha"
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
-"N�o � poss�vel decifrar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
+"N�o � poss�vel decifrar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
+"PGP: %s"
 
 #: camel/camel-provider.c:130
 #, c-format
@@ -6329,7 +6342,7 @@ msgstr "Verificando novas mensagens"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Pastas"
 
@@ -7490,7 +7503,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7499,29 +7512,29 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:937
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1008
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7529,16 +7542,16 @@ msgstr ""
 "N�o � poss�vel abrir a pasta de rascunhos para esta conta.\n"
 "Voc� gostaria de usar a pasta de rascunhos padr�o?"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "N�o foi poss�vel recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7547,7 +7560,7 @@ msgstr ""
 "N�o � poss�vel buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1083
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7556,7 +7569,7 @@ msgstr ""
 "N�o � poss�vel truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7565,7 +7578,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1194
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7573,7 +7586,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos n�o salvos de uma sess�o anterior.\n"
 "Voc� gostaria de tentar recuper�-los?"
 
-#: composer/e-msg-composer.c:1345
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7583,23 +7596,23 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: composer/e-msg-composer.c:1352
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1375
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1524
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserir arquivo"
 
-#: composer/e-msg-composer.c:1899 composer/e-msg-composer.c:2340
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2357
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7607,7 +7620,7 @@ msgstr ""
 "N�o foi poss�vel criar janela de redator:\n"
 "N�o � poss�vel ativar o controle seletor de endere�os."
 
-#: composer/e-msg-composer.c:2380
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7615,7 +7628,7 @@ msgstr ""
 "N�o foi poss�vel criar janela de redator:\n"
 "N�o � poss�vel ativar o componente editor de HTML."
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7623,7 +7636,7 @@ msgstr ""
 "N�o foi poss�vel criar janela de redator porque voc� ainda n�o\n"
 "configurou nunhuma identidade no componente de correio."
 
-#: composer/evolution-composer.c:375
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "N�o � poss�vel iniciar o redator do Evolution."
 
@@ -7686,13 +7699,13 @@ msgstr "Lembrar esta senha pelo restante desta sess�o"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7743,30 +7756,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1390 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1387 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -8193,7 +8206,7 @@ msgstr "come�a com"
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assunto"
@@ -8689,7 +8702,7 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Voc� n�o pode criar duas contas com o mesmo nome."
 
@@ -9141,8 +9154,8 @@ msgstr "Rascunho"
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -9560,75 +9573,77 @@ msgstr "N�o foi poss�vel analisar mensagem MIME. Exibindo como fonte."
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Endere�o inv�lido"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1821
+#: mail/mail-format.c:1799
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
-msgstr "Esta mensagem est� assinada digitalmente. Clique no cadeado para mais informa��es."
+msgstr ""
+"Esta mensagem est� assinada digitalmente. Clique no cadeado para mais "
+"informa��es."
 
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1822
 msgid "Evolution does not recognize this type of signed message."
 msgstr "O Evolution n�o reconhece este tipo de mensagem assinada."
 
-#: mail/mail-format.c:1852
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensagem est� assinada digitalmente e � aut�ntica."
 
-#: mail/mail-format.c:1860
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Esta mensagem est� assinada digitalmente mas n�o � poss�vel estabelecer sua "
 "autenticidade."
 
-#: mail/mail-format.c:2076
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2090
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) v�lido no site \"%s\""
 
-#: mail/mail-format.c:2095
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2132
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2137
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
@@ -9682,7 +9697,7 @@ msgstr "Voc� n�o pode alterar o formato de pastas remotas."
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9691,7 +9706,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9700,7 +9715,7 @@ msgstr ""
 "Erro ao executar opera��o:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Trabalhando"
 
@@ -10179,27 +10194,37 @@ msgstr "%l:%M %d de %B"
 msgid "Mail summary"
 msgstr "Resumo da mensagem"
 
-#: my-evolution/e-summary-preferences.c:423
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr "SBFN"
+
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Cita��es do dia"
 
-#: my-evolution/e-summary-preferences.c:918
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de not�cias"
 
-#: my-evolution/e-summary-preferences.c:926
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entre a URL da fonte not�cias que voc� deseja adicionar"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1476
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Configura��es do resumo"
 
@@ -10232,14 +10257,6 @@ msgstr "<dd><b>O servidor de tempo n�o p�de ser contactado</b></dd>"
 msgid "Weather"
 msgstr "Tempo"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS"
-msgstr "SBFN"
-
 #: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regi�es"
@@ -11934,7 +11951,8 @@ msgstr ""
 
 #: shell/e-shell-startup-wizard.c:169
 msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "N�o foi poss�vel iniciar a interface do Assistente de correio do Evolution\n"
+msgstr ""
+"N�o foi poss�vel iniciar a interface do Assistente de correio do Evolution\n"
 
 #: shell/e-shell-startup-wizard.c:754
 msgid ""
@@ -11944,6 +11962,24 @@ msgstr ""
 "Por favor selecione a informa��o\n"
 "que voc� gostaria de importar"
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "N�o foi fornecido um nome de arquivo."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Esta pasta n�o pode conter mensagens."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n�o foi encontrado em seu $PATH."
@@ -11998,27 +12034,27 @@ msgstr "Trabalhar desconectado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:1592
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1594
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "O Ximian Evolution est� atualmente conectado. Clique neste bot�o para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:1648
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution est� em preocesso de se desconectar."
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -12254,63 +12290,63 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "J� possui um dono"
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "N�o encontrado"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Tipo n�o suportado"
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Schema n�o suportado"
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Opera��o n�o suportada"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "URI inv�lida"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Sem espa�o remanescente"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
@@ -12468,61 +12504,24 @@ msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution est� saindo agora ..."
 
-#: shell/main.c:193
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Obrigado\n"
-"O time do Ximian  Evolution\n"
-
-#: shell/main.c:268
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o � poss�vel acessar a shell do Ximian Evolution."
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o � poss�vel iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:347
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a sa�da de depura��o de todos os componentes para um arquivo."
 
-#: shell/main.c:390
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "N�o � poss�vel iniciar o sistema de componentes Bonobo."
 
@@ -12822,11 +12821,12 @@ msgstr "Imprimir..."
 
 #: 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:236
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Salvar"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Salvar e fechar"
 
@@ -12842,7 +12842,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Arquivo"
@@ -12864,7 +12864,7 @@ msgstr "Salvar o contato e fechar 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:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -13494,7 +13494,7 @@ msgstr "Fechar esta janela"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Fechar"
@@ -13525,8 +13525,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifrar esta mensagem usando o seu certificado de cifragem S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormato"
+#, fuzzy
+msgid "For_mat"
+msgstr "Formato"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13577,7 +13578,7 @@ msgid "Save in folder..."
 msgstr "Salvar na pasta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
@@ -13670,7 +13671,7 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -13686,7 +13687,7 @@ msgstr "Campo _Responder-a"
 msgid "_Security"
 msgstr "_Seguran�a"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -14023,7 +14024,7 @@ msgstr "Agora"
 msgid "Today"
 msgstr "Hoje"
 
-#: widgets/misc/e-cell-date-edit.c:753
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
@@ -14109,23 +14110,23 @@ msgstr "Codifica��o de caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:149
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor de buscas"
 
-#: widgets/misc/e-filter-bar.c:165
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Adicionar �s busca salvas"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Exibir todos"
 
@@ -14179,3 +14180,40 @@ msgstr "init_corba(): n�o foi poss�vel iniciar GNOME"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Obrigado\n"
+#~ "O time do Ximian  Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormato"
diff --git a/po/ro.po b/po/ro.po
index f79bc91b7a..f206576370 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\n"
-"POT-Creation-Date: 2001-10-02 17:45-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -15,6 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Import fi�ierele card V �n Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
@@ -23,291 +33,296 @@ msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
 msgid "Imports VCard files into Evolution."
 msgstr "Import fi�ierele card V �n Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Pune la fi�ier ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Nume"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Asistent"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Serviciu"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Rechemare"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Companie"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Adresa de acas�"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organiza�ie"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Ma�in�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax acas�"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Serviciu 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Adresa de acas� 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Alte"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Alt 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "Email 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Departament"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Dep"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titlu"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Profesie"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Porecl�"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Porecl�"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "So�/so�ie"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Not�"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Calendar URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL liber-ocupat"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Aniversare:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Aniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Data na�terii"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorii"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Nume de familie"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Card: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -315,7 +330,7 @@ msgstr ""
 "\n"
 "Nume: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -323,7 +338,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -331,7 +346,7 @@ msgstr ""
 "\n"
 "  Dat:        "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -339,7 +354,7 @@ msgstr ""
 "\n"
 "  Suplimentar:  "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -347,7 +362,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -355,7 +370,7 @@ msgstr ""
 "\n"
 "  Sufix:      "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -363,7 +378,7 @@ msgstr ""
 "\n"
 "Data na�terii:"
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -371,7 +386,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -379,7 +394,7 @@ msgstr ""
 "\n"
 "  C�su�a po�tal�:"
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -387,7 +402,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -395,7 +410,7 @@ msgstr ""
 "\n"
 "  Strada:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -403,7 +418,7 @@ msgstr ""
 "\n"
 "  Ora�:        "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -411,7 +426,7 @@ msgstr ""
 "\n"
 "  Regiunea:    "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -419,7 +434,7 @@ msgstr ""
 "\n"
 "  Cod po�tal:  "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -427,7 +442,7 @@ msgstr ""
 "\n"
 "  �ara:        "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -435,7 +450,7 @@ msgstr ""
 "\n"
 "Eticheta de livrare:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -443,7 +458,7 @@ msgstr ""
 "\n"
 "Telefoane:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -451,7 +466,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -459,7 +474,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -467,7 +482,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -475,25 +490,25 @@ msgstr ""
 "\n"
 "Program de mail:"
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -501,7 +516,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -509,7 +524,7 @@ msgstr ""
 "\n"
 "  Nume:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -517,7 +532,7 @@ msgstr ""
 "\n"
 "  Unitate:"
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -525,7 +540,7 @@ msgstr ""
 "\n"
 "  Unitate2:"
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -533,7 +548,7 @@ msgstr ""
 "\n"
 "  Unitate3:"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -541,7 +556,7 @@ msgstr ""
 "\n"
 "  Unitate4"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -549,7 +564,7 @@ msgstr ""
 "\n"
 "Categorii:  "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -567,7 +582,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -575,7 +590,7 @@ msgstr ""
 "\n"
 "�ir unic:      "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -583,11 +598,11 @@ msgstr ""
 "\n"
 "Cheia public�:"
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -596,82 +611,84 @@ msgstr "Card V pentru %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:1167
-#: addressbook/gui/component/addressbook-factory.c:48
-#: 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
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot ini�ializa Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Caut..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "�ncarc..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "Eroare la c�utarea expresiei."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Conectare la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Nu m� pot conecta la serverul LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "A�tept conectarea la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Repornire c�utare."
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook ne�nc�rcat\n"
 
-#: addressbook/conduit/address-conduit.c:731
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Nu pot porni serverul wombat"
 
-#: addressbook/conduit/address-conduit.c:732
-#: calendar/conduits/calendar/calendar-conduit.c:838
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Nu pot porni wombat"
 
-#: addressbook/conduit/address-conduit.c:762
-#: addressbook/conduit/address-conduit.c:765
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -715,43 +732,43 @@ msgstr "Procesator pentru apari�ia adreselor din agend�"
 msgid "Factory for the sample Addressbook control"
 msgstr "Procesator pentru controlul mostr� agend�"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Dosar con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "_Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-config.c:188
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Edit Addressbook"
 msgstr "Editare agend�"
 
@@ -780,7 +797,7 @@ msgid "Base"
 msgstr "Baza"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:172
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "De baz�"
 
@@ -789,127 +806,122 @@ msgid "De_lete"
 msgstr "�terge"
 
 #: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Email Address:"
+msgstr "Adresa email:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
 msgstr "Unu"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Search _base:"
 msgstr "Domeniu c�utare:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Search s_cope: "
 msgstr "Scopul c�ut�rii:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:14
 #, fuzzy
 msgid "Server Name"
 msgstr "Selec�ie nume"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:15
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:22
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:23
 #, fuzzy
 msgid "_Account name:"
 msgstr "Management cont"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/addressbook-config.glade.h:24
 #: 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
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Adaug�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editeaz�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:26
 #, fuzzy
 msgid "_My server requires authentication"
 msgstr "Serverul necesit� autentificare"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:27
 #, fuzzy
 msgid "_Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/addressbook-config.glade.h:28
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/addressbook-storage.c:163
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Nu pot ini�ializa gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Alte contacte"
 
-#: addressbook/gui/component/addressbook.c:407
-#, fuzzy, c-format
-msgid "Please enter your email address and password for access to %s"
-msgstr "V� rog introduce�i parola pentru %s"
-
-#: addressbook/gui/component/addressbook.c:415
-#, fuzzy
-msgid "LDAP Authentication"
-msgstr "Autentificare"
-
-#: addressbook/gui/component/addressbook.c:426
-msgid "Email Address:"
-msgstr "Adresa email:"
-
-#: addressbook/gui/component/addressbook.c:439
-#, fuzzy
-msgid "Password:"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -919,7 +931,7 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -931,7 +943,7 @@ msgstr ""
 "programul din sursele CVS dup� ce desc�rca�i OpenLDAP urm�nd\n"
 "leg�tura urm�toare.\n"
 
-#: addressbook/gui/component/addressbook.c:522
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -939,39 +951,44 @@ msgstr ""
 "Nu pot deschide aceast� agend�. V� rog verifica�i dac� exist� calea\n"
 "�i daca ave�i drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:663
+#: addressbook/gui/component/addressbook.c:623
+#, fuzzy, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduce�i parola pentru %s"
+
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Orice c�mp con�ine"
 
-#: addressbook/gui/component/addressbook.c:664
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Numele con�ine"
 
-#: addressbook/gui/component/addressbook.c:665
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "Email-ul con�ine"
 
-#: addressbook/gui/component/addressbook.c:666
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Avansat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:897
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:939
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 
@@ -985,51 +1002,51 @@ msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 msgid "(none)"
 msgstr "(F�r� nume)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Email principal"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Selectez o ac�iune"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Creaz� contact nou \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Adaug� adresa la contactul existent \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "C�utare agend�..."
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Editare informa�ii contact"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Adaug� la contacte"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Reune�te adresele email:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Dezactivare interog�ri"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activare interog�ri (Periculos!)"
 
@@ -1041,51 +1058,60 @@ msgstr "Interfa�a de selectare nume a agendei Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Procesator interfa�a de selectare nume a agendei"
 
-#: 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
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "�terge"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "�terge tot"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Trimit mail HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Contact"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:521
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:598
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1150,12 +1176,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalii"
 
@@ -1224,9 +1250,9 @@ msgstr "_Contacte..."
 
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_�terge"
@@ -1296,37 +1322,47 @@ msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
 msgid "Delete Contact?"
 msgstr "�terg persoana de contact?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Contact Ad�ugare-Rapid�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Editare complet�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Cea��"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2024,347 +2060,351 @@ msgid "Palau"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Palestinian Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
 #, fuzzy
 msgid "Panama"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
 #, fuzzy
 msgid "Peru"
 msgstr "H�rtie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
 #, fuzzy
 msgid "Poland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
 #, fuzzy
 msgid "Portugal"
 msgstr "Portret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
 #, fuzzy
 msgid "Qatar"
 msgstr "dup�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
 msgid "Republic Of Korea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
 msgid "Republic Of Moldova"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
 #, fuzzy
 msgid "Reunion"
 msgstr "Regiuni"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
 msgid "Romania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
 #, fuzzy
 msgid "Rwanda"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
 #, fuzzy
 msgid "Samoa"
 msgstr "Fum"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
 #, fuzzy
 msgid "Senegal"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
 #, fuzzy
 msgid "Seychelles"
 msgstr "Program"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
 #, fuzzy
 msgid "Somalia"
 msgstr "Normal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
 msgid "South Africa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
 #, fuzzy
 msgid "Spain"
 msgstr "Ploaie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
 #, fuzzy
 msgid "Sudan"
 msgstr "Dum"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
 #, fuzzy
 msgid "Suriname"
 msgstr "Porecl�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
 #, fuzzy
 msgid "Swaziland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
 #, fuzzy
 msgid "Sweden"
 msgstr "V�zut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
 #, fuzzy
 msgid "Taiwan"
 msgstr "Ploaie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de sarcini"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
 #, fuzzy
 msgid "Thailand"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
 #, fuzzy
 msgid "Togo"
 msgstr "La"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
 #, fuzzy
 msgid "Tonga"
 msgstr "Ast�zi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
 #, fuzzy
 msgid "Turkey"
 msgstr "Mar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Turc"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
 msgid "U.S. Virgin Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
 #, fuzzy
 msgid "Uganda"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
 #, fuzzy
 msgid "Ukraine"
 msgstr "Ucrainean"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
 msgid "United Republic Of Tanzania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
 #, fuzzy
 msgid "United States"
 msgstr "(Mesaj f�r� titlu)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Selec�ie nume"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
 #, fuzzy
 msgid "Western Sahara"
 msgstr "Europa de vest"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
 #, fuzzy
 msgid "Yemen"
 msgstr "V�zut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
 msgid "Yugoslavia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_City:"
 msgstr "Lo_calitate:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_PO Box:"
 msgstr "C�su�a _po�tal�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:241
 msgid "_ZIP Code:"
 msgstr "Cod po�tal:"
 
@@ -2463,7 +2503,7 @@ msgid "contact-list-editor"
 msgstr "editor-lista-contact"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
@@ -2513,153 +2553,160 @@ msgstr ""
 "Emailul modificat sau numele acestui contact exist� deja\n"
 "�n acest dosar. Dori�i s� continua�i �n acest caz?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "C�utare avansat�"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Caut�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d secunde"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Deschide"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�nainteaz� _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tip�re�te"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Tip�re�te plic"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "�terg"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Eroare la modificare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
-#: shell/e-storage.c:520
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Acces interzis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Nu g�sesc card-ul"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "ID-ul card-ului exist� deja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
-#: camel/camel-service.c:634
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Revocat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Alt� eroare"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Dori�i s� salva�i modific�rile?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Eroare ad�ugare list�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Eroare ad�ugare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Eroare la �tergerea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Eroare �tergere card"
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2667,75 +2714,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Clic aici s� ad�uga�i un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Telefon principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Telefon asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Telefon serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Telefon revenire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Telefon companie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telefon acas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Adresa serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adresa acas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telefon ma�in�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telefon acas� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Alt telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Alt� adres�"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Salveaz� in agend�"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2923,98 +2979,113 @@ msgstr "L��ime:"
 msgid "_Font..."
 msgstr "Font..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Tip�re�te plic"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Editeaz� �nt�lnire"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Ridicat"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Sc�zut"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:793
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: calendar/conduits/calendar/calendar-conduit.c:896
-#: calendar/conduits/calendar/calendar-conduit.c:899
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nu pot citi pilotul blocului aplica�ie calendar"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nu pot citi pilotul blocului aplica�ie ToDo"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Component� Evolution pentru manipularea calendarului."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Procesator pentru componenta Centralizator a calendarului"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Procesator pentru controlul calendar iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Procesator pentru mostra controlului calendar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Procesator pentru componenta calendarului Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Procesator pentru componenta calendarului Evolution."
@@ -3027,49 +3098,29 @@ msgstr "Serviciu notificare alarme"
 msgid "Factory for the alarm notification service"
 msgstr "Procesator pentru serviciul notificare alarme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr ""
-"Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s �i se termin� la %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "Notificare depre �nt�lnirea dumneavoastr� ce se trmin� la %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
-msgstr "Notificare depre �nt�lnirea dumneavoastr�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Set�ri"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
-"Notificare depre sarcina dumneavoastr� ce �ncepe la %s �i se termin� la %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
-msgstr "Notificare depre sarcina dumneavoastr� ce �ncepe la %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr "Notificare depre sarcina dumneavoastr� ce �ncepe la %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Ora d_e sf�r�it"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr "Notificare despre sarcina dumneavoastr�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma �n %A %b %d %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarme"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3088,11 +3139,11 @@ msgstr "Durata de sfor�ire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:629
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Nu e disponibil� o descriere."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:689
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3100,7 +3151,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:740
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3111,38 +3162,39 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nu pot ini�ializa GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Nu pot ini�ializa gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c: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
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d %B %Y"
@@ -3150,100 +3202,78 @@ msgstr "%A, %d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confiden�ial"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Grec"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "�n derulare"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Terminat"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data trebuie introdus� �n formatul: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3253,53 +3283,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Valorile procentuale pot fi �ntre 0 �i 100, inclusiv"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Alocat"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nu"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Caut..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Afi�are zi"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Afi�are s�pt�m�n� de lucru"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Afi�are s�ptam�n�"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Afi�are lun�"
 
@@ -3315,12 +3348,12 @@ msgstr "Descrierea con�ine"
 msgid "Comment contains"
 msgstr "Comentariul con�ine"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3328,9 +3361,9 @@ msgstr "Calendar"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: 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
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Sarcini"
@@ -3340,26 +3373,26 @@ msgstr "Sarcini"
 msgid "Folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Creaz� o �nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Creaz� o sarcin� nou�"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI afi�at de calendar"
 
@@ -3429,48 +3462,48 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d zile"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 zi"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d s�pt�m�ni"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 s�pt�m�n�"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 or�"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minute"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d secunde"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 secund�"
 
@@ -3528,17 +3561,12 @@ msgstr "dup� sf�r�itul �nt�lnirii"
 msgid "%s at the end of the appointment"
 msgstr "dup� sf�r�itul �nt�lnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, fuzzy, c-format
-msgid "%s at an unknown time"
-msgstr "Eroare necunoscut�"
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s server %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3559,7 +3587,7 @@ msgstr "Memorator"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -3589,7 +3617,7 @@ msgstr "sf�r�it �nt�lnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -3646,7 +3674,7 @@ msgid "First day of wee_k:"
 msgstr "Prima zi a s�pt�minii:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Vineri"
 
@@ -3661,7 +3689,7 @@ msgid "Minutes"
 msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:951
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Luni"
 
@@ -3671,7 +3699,7 @@ msgid "O_verdue tasks:"
 msgstr "Sarcini �nt�rziate"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "S�mb�t�"
 
@@ -3697,7 +3725,7 @@ msgid "Su_n"
 msgstr "Dum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Duminic�"
 
@@ -3717,7 +3745,7 @@ msgid "Tas_ks due today:"
 msgstr "Sarcini pentru azi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Joi"
 
@@ -3740,12 +3768,12 @@ msgid "Time format:"
 msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Mar�i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Miercuri"
 
@@ -3828,118 +3856,123 @@ msgstr "Mie"
 msgid "before the start of the appointment"
 msgstr "�nainte de �nceperea �nt�lnirii"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Datele �nt�lnirii s-au schimbat. Trimit o versiune actualizat�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� �nt�lnire?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� sarcin�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i intrarea din jurnal?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Acest eveniment a fost �ters."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Acest� sarcin� a fost �tears�."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Aceast� intrare �n jurnal a fost �ters�."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s A�i f�cut modific�ri. Ignora�i aceste schimb�ri �i �nchide�i editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s N-a�i f�cut modific�ri, �nchide�i editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Acest eveniment a fost modificat."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Aceast� sarcina a fost modificat�."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Aceast� intrare �n jurnal a fost modificat�."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s A�i f�cut modific�ri. Ignora�i aceste modific�ri �i actualiza�i editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu a�i f�cut modific�ri, actualiza�i editorul?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " la "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Nu pot actualiza fi�ierele corect"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Suprascrie�i fi�ierul?"
 
-#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3947,53 +3980,53 @@ msgstr ""
 "Fi�ier al c�rui nume exist� deja.\n"
 "�l suprascrie�i?"
 
-#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1172
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Nu pot ob�ine versiunea curent�!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i �nt�lnirea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i �nt�lnirea"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sunte�i sigur c� dori�� s� �terge�i sarcina `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sunte�i sigur c� dori�� s� �terge�i aceast� sarcin�?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i intrarea din jurnal `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i aceast� intrare din jurnal?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i �nt�lnirea `%d'?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i task-ul `%d'?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i %d intr�ri din jurnal?"
@@ -4013,26 +4046,26 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "�terse"
 
-#: calendar/gui/dialogs/event-editor.c:181
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "�nt�lnire"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Reaminte�te"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: calendar/gui/dialogs/event-editor.c:198
-#: calendar/gui/dialogs/event-editor.c:345
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Progra_mare �nt�lniri"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:348
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "�nt�lnire"
 
@@ -4052,12 +4085,13 @@ msgid "Classification"
 msgstr "Clasificare"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Confiden�ial"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data & Ora"
 
@@ -4067,12 +4101,12 @@ msgid "F_ree"
 msgstr "Grec"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
@@ -4083,7 +4117,7 @@ msgid "Show Time As"
 msgstr "Ploaie toren�ial�"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Rezu_mat:"
 
@@ -4095,40 +4129,20 @@ msgstr "Ora d_e sf�r�it"
 msgid "_Start time:"
 msgstr "Ora de �nceput"
 
-#: calendar/gui/dialogs/meeting-page.c:504
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:548
-#: calendar/gui/dialogs/meeting-page.c:583
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Telefon ma�in�"
-
-#: calendar/gui/dialogs/meeting-page.c:550
-#: calendar/gui/dialogs/meeting-page.c:583
-#: calendar/gui/dialogs/meeting-page.c:703
+#: calendar/gui/dialogs/meeting-page.c:422
 #, fuzzy
-msgid "Required Participants"
-msgstr "Participant necesar"
-
-#: calendar/gui/dialogs/meeting-page.c:552
-#: calendar/gui/dialogs/meeting-page.c:583
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Participant op�ional"
+msgid "An organizer is required."
+msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:583
-#, fuzzy
-msgid "Non-Participants"
-msgstr "Neparticipant"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:661
-msgid "Sent By:"
-msgstr "Trimis de:"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:829
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
@@ -4169,6 +4183,7 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4187,7 +4202,7 @@ msgstr "Stare"
 
 #: 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tip"
@@ -4202,40 +4217,36 @@ msgid "_Change Organizer"
 msgstr "Schimb� organizator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "_Invit� pe al�ii..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "Alt _organizator"
 
-#: 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"
-
-#: calendar/gui/dialogs/recurrence-page.c:570
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Aceast� �nt�lnire con�ine reveniri pe care Evolution nu le poate edita."
 
-#: calendar/gui/dialogs/recurrence-page.c:924
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1080
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1261
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "apari�ii"
 
@@ -4303,22 +4314,18 @@ msgstr "s�pt�m�na"
 msgid "year(s)"
 msgstr "anul"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Dori�i s� salva�i modific�rile?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Informa�iile despre �nt�lnire au fost schimbate. Trimit o versiune "
 "actualizat�?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Informa�iile despre sarcin� au fost schimbate. Trimit o versiune actualizat�?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Intrarea �n jurnal a fost schimbat�. Trimit o versiune actualizat�?"
 
@@ -4337,7 +4344,7 @@ msgid "Progress"
 msgstr "�n desf�urare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:949
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4349,144 +4356,175 @@ msgstr "_Prioritate:"
 msgid "_Status:"
 msgstr "_Stare"
 
-#: calendar/gui/dialogs/task-editor.c:184
-#: calendar/gui/dialogs/task-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Descriere:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Data de �nceput:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Confiden�ial"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data scadent�:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "�terge contactele selectate"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "Deschide"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upeaz�"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_Copiaz�"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcheaz� ca terminat"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "�terg aceast� sarcin�"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marcheaz� sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Clic aici s� ad�uga�i o sarcin�"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Data trebuie introdus� �n formatul: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Terminat"
 
@@ -4517,8 +4555,8 @@ msgstr "Data �nceput"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Rezumat"
 
@@ -4530,339 +4568,424 @@ msgstr "Sortare sarcini"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i diviziuni minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 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:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "�terge aceast� �nt�lnire"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "F� aceast� apari�ie mutabil�"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�terge aceast� apari�ie"
 
-#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�terge toate apari�iile"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Terminat "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informa�ie calendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Calendar"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Eroare necunoscut�"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Selectez o ac�iune"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "a fost dup�"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr " Accept� "
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Inten�ie "
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr " Refuz� "
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Descriere:"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Renun��"
+
+#: calendar/gui/e-itip-control.c:867
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de �nt�lnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "G�se�te �n mesaj"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost dup�"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "R�spunde"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Acesta e un r�spuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tip�re�te mesaj"
 
-#: calendar/gui/e-itip-control.c:916
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Mesajul nu pare a fi formatat corespunz�tor."
 
-#: calendar/gui/e-itip-control.c:935
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1142
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nu pot �terge elementul din fi�ierul calendar!\n"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4903,86 +5026,106 @@ msgstr "dat� sf�r�it"
 msgid "date-start"
 msgstr "dat� �nceput"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon ma�in�"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participant necesar"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participant op�ional"
+
+#: calendar/gui/e-meeting-model.c:97
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Neparticipant"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Surs�"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Scaun"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 #, fuzzy
 msgid "Accepted"
 msgstr " Accept� "
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr " Refuz� "
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Tentativ�"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "�terse"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "�n derulare"
@@ -4990,114 +5133,120 @@ msgstr "�n derulare"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Afar� din oficiu"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Nici o informa�ie"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Invit� pe al�ii..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Op�iuni"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Arat� numai _orele de lucru"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Arat� m�rit"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeaz� liber/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "To_ate persoanele �i resursele"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele �i o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Necesa_r o persoan�"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoan� �i _o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Ora de �nceput a �nt�lnirii:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Deschid rezerva %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot inc�rca sarcinile �n `%s'"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/gnome-cal.c:1319
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/gnome-cal.c:1330
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e suportat�"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Deschide calendar"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprilie"
@@ -5155,221 +5304,276 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
+#: calendar/gui/itip-utils.c:243
+msgid "Atleast one attendee is necessary"
+msgstr ""
+
 #: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Du"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curent� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "S�pt�m�na curent� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Luna curent� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Sarcin�"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Stare"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritate:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "�nt�lnire �ncheiat�:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Categorii:  "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "Contacte"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
-#: 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
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Previzualizeaz� tip�rirea"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Tip�re�te elementul"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Seteaz� tip�rirea"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "De afi�at URI pentru dosarul sarcini"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5377,7 +5581,7 @@ msgstr ""
 "Evolution a preluat sarcinile care au fost in dosarul calendar �i le-a "
 "transferat �ntr-un nou dosar de sarcini."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5388,7 +5592,7 @@ msgstr ""
 "le-a transferat �ntr-un nou dosar de sarcini.C�teva sarcini nu pot fi "
 "transferate, a�a c� acest proces se poate relua �n viitor"
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5397,7 +5601,7 @@ msgstr ""
 "Nu pot deschide `%s'; nici un articol din dosarul calendar nu va fi "
 "transferat �n dosarul de sarcini"
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5406,113 +5610,113 @@ msgstr ""
 "Metoda cerut� pentru a �nc�rca `%s' nu e suportat�; nici un articol din "
 "dosarul calendar nu va fi transferat �n dosarul de sarcini"
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: calendar/pcs/query.c:230
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:254
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:267
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:308
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:335
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:367
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:408
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:516
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:650
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:658
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:675
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:729
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:817
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:862
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1155
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5536,7 +5740,7 @@ msgstr "Criptarea nu e suportat� de acest cifru"
 msgid "Decryption is not supported by this cipher"
 msgstr "Decriptarea nu e suportat� de acest cifru"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5547,7 +5751,7 @@ msgstr ""
 "C�teva opera�ii nu vor fi ref�cute pe acest server la reconectarea\n"
 "�n re�ea."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5558,87 +5762,94 @@ msgstr ""
 "%s\n"
 "Schimb�rile f�cute �n acest dosar nu vor fi resincronizate."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resincronizare cu serverul"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "E�uare la mesajul %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execu�ie filtru c�utare: %s: %s"
 
-#: camel/camel-folder.c:472
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1039
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Eroare executare expresia c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1219
+#: camel/camel-folder.c:1080
+#, fuzzy, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Eroare executare expresia c�utare: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiez mesaje"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5647,7 +5858,7 @@ msgstr ""
 "Nu pot parsa expresia de c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5656,7 +5867,7 @@ msgstr ""
 "Eroare executare expresia c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(potrivire total�) se cere un singur rezultat"
 
@@ -5665,197 +5876,197 @@ msgstr "(potrivire total�) se cere un singur rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Execut� interogare �n header necunoscut: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tip invalid �n con�inutul mesajului, necesar �ir"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nu pot bloca: '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nu pot crea fi�ier de blocare pentru %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Timp expirat la �ncercarea de blocare a fi�ierului %s. �ncerca�i mai t�rziu."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "E�uare la blocare prin folosirea fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "E�ec la blocarea prin folosirea flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nu pot verifica fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul temporar cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "E�uare la stocarea mesajului �n fi�ierul temporar %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nu pot crea conexiunea: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nu pot bifurca: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "E�uare program de mutare mesaje: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Eroare necunoscut�)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Eroare la citirea fi�ierului cu mesaje: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Eroare la scrierea fi�ierului cu mesaje temporar: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fi�ierului cu mesaje temporar: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "V� rog introduce�i %s fraza de trecere pentru %s"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "V� rog introduce�i fraza de trecere %s"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Nu pot crea fi�ier temp: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nu pot �nc�rca %s: �nc�rcarea modulului nu e suportat� �n acest sistem."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot �nc�rca %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nu pot �nc�rca %s: Nu exist� cod de ini�ializare �n modul"
@@ -5875,7 +6086,7 @@ msgid "Connection cancelled"
 msgstr "Conexiune anulat�"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nu m� pot conecta la %s (port %d): %s"
@@ -5885,12 +6096,12 @@ msgid "(unknown host)"
 msgstr "(gazd� necunoscut�)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Opera�ia anulat�"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat nea�teptat"
@@ -6001,7 +6212,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
@@ -6018,8 +6229,8 @@ msgid "Unknown authentication state."
 msgstr "Stare necunoscut� a autentific�rii."
 
 #: 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Parola"
 
@@ -6044,7 +6255,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:111
+#: camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate e�uat�: %s: %s"
@@ -6064,40 +6275,40 @@ msgstr "URL '%s' necesit� o component� gazd�"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:629
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "E�ec la c�utarea numelui: %s"
 
-#: camel/camel-service.c:654
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:656
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Furnizor de email �n dosar virtual"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nici un furnizor valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6143,12 +6354,17 @@ msgstr "E�ec la decodarea mesajului."
 msgid "Failed to verify certificates."
 msgstr "E�ec la verificarea certificatului."
 
-#: camel/camel-store.c:273
+#: camel/camel-store.c:220
+#, fuzzy
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6158,7 +6374,7 @@ msgstr ""
 "Subiect: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6173,7 +6389,7 @@ msgstr ""
 "\n"
 "Dori�i s� accepta�i oricum?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6192,42 +6408,42 @@ msgstr ""
 "Stat: %s\n"
 "�ara: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:554
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Nu exist� mesajul: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:286
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:298
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:326
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vtrash-folder.c:117
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nu pute�i copia mesaje din acest dosar"
 
@@ -6255,59 +6471,59 @@ msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�spunsul serverului IMAP nea�teptat OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:208
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot �nc�rca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:272
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus �i recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:434
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1899
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1633
-#: camel/providers/imap/camel-imap-folder.c:1714
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1639
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1936
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
@@ -6315,7 +6531,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Dosare"
 
@@ -6349,28 +6565,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aceast� op�iune v� va conecta la serverul IMAP folosind o parol� �n clar "
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serverul IMAP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sV� rog intoduce�i parola IMAP pentru %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Nu a�i introdus o parol�."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6381,117 +6597,130 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu exist� dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:41
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pentru stocarea mail-urilor �ntr-un director de tip MH"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Dosare speciale"
 
-#: camel/providers/local/camel-local-provider.c:51
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pentru stocarea mail-urilor locale �n format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplic� filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/local/camel-local-provider.c:66
-msgid "Qmail maildir-format mail files"
-msgstr "Fi�ier �n format qmail maildir"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:67
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "Pentru stocarea mail-urilor locale �n directoare qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Mbox Unix standard"
 
-#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:81
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Pentru stocarea mail-urilor locale �n directoare spool Unix"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocarea root %s nu e o cale absolut�"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Stocarea root %s nu e director obi�nuit"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Stoc�rile locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fi�ier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s �n %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:418
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-local-summary.c:367
+#, fuzzy, c-format
+msgid "Could not save summary: %s: %s"
+msgstr "Nu pot �nc�rca sumarul pentru %s"
+
+#: camel/providers/local/camel-local-summary.c:423
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nu pot ad�uga mesajul la sumar: motiv necunoscut"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "E�uare la mesajul %d"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la dosarul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c: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:537
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6500,20 +6729,20 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: 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:537
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Nu exist� mesaj"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6522,15 +6751,15 @@ msgstr ""
 "Nu pot deschide dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Dosarul `%s' nu exist�."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6539,19 +6768,19 @@ msgstr ""
 "Nu pot crea dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nu e un director de tip maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot �terge dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
@@ -6566,29 +6795,34 @@ msgstr "Nu pot scana dosarul `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nu pot deschide calea c�tre directorul maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:273
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:414
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Opera�ia anulat�"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nu pot ad�uga mesajul la fi�ierul mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:553
-#: camel/providers/local/camel-spool-folder.c:585
-#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6597,17 +6831,17 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:586
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:599
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construc�ia mesajului e�uat�: c�su�a po�tal� corupt�?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6616,7 +6850,7 @@ msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6625,14 +6859,14 @@ msgstr ""
 "Nu pot crea fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nu e un fi�ier obi�nuit."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6641,108 +6875,116 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a �ters."
 
 #. 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-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
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Nu pot deschide dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Eroare fatal� la parserul de mail la pozi�ia %ld �n dosarul %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:507
-#: camel/providers/local/camel-mbox-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nu pot deschide c�su�a po�tal� temporar�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
-#: camel/providers/local/camel-mbox-summary.c:557
-#: camel/providers/local/camel-mbox-summary.c:746
-#: camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sumarul �i dosarul nu se potrivesc, chiar dup� o sincronizare"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Eroare la scrierea �n c�su�a po�tal� temporar�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "E�ec la scrierea �n c�su�a po�tal�: %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:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nu pot �nchide dosarul surs� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot �nchide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:878
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscut�: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Trimite mesaj la contact"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la dosarul mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e un director"
@@ -6752,66 +6994,49 @@ msgstr "`%s' nu e un director"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nu pot deschide calea c�tre directorul MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:470
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nu pot ad�uga mesajul la fi�ierul spool: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Dosarul `%s'/%s nu exist�."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fi�ier spool mail %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi �terse"
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Rezumare dosar"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nu pot deschide dosarul: %s: rezumare de la pozi�ia %ld: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Nu pot rezuma dosarul: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nu pot sincroniza dosarul temporar: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nu pot sincroniza dosarul spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6820,142 +7045,142 @@ msgstr ""
 "Nu pot sincroniza dosarul spool %s: %s\n"
 "Dosarul poate fi corupt, copia salvat� �n `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nu pot �nc�rca %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduce�i v� rog parola NNTP pentru %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Nume utilizator rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "E�ec la trimiterea numelui utilizator la server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Nume utilizator/parol� rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Mesajul %s neg�sit."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nu pot ob�ine lista grup de la server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nu pot s� �ncarc fi�ierul list� de grup pentru %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nu pot s� salvez fi�ierul list� de grup pentru: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "�tiri USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Acesta e un provider pentru citirea din �i postarea �n grupuri de �tiri "
 "USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nu pot deschide directorul pentru serverul de news: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "�tiri USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Aceast� optiune v� va autentifica la serverul NNTP folosind o parol� �n clar "
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nu pot s� deschid sau s� creez fi�ierul .newsrc pentru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:189
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Primesc sumarul POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:195
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nu pot verifica mesajele noi pe serverul POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:242
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nu pot deschide dosarul: lista de mesaje a fost incomplet�."
 
-#: camel/providers/pop3/camel-pop3-folder.c:266
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Decupeaz� mesajele selectate"
 
-#: camel/providers/pop3/camel-pop3-folder.c:342
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nu pot aduce mesajul: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:358
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nu pot recupera primi de la serverul POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:381
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nici un mesaj cu uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:385
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Primesc mesajul POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Stocare mesaje"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Las� mesajele pe server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "�tergere dup� %s zi(le)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Pentru citirea �i stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6963,7 +7188,7 @@ msgstr ""
 "Aceast� op�iune v� va conecta la serverul POP folosind o parol� �n clar. "
 "Aceasta este singura op�iune suportat� de majoritatea serverelor POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6973,33 +7198,33 @@ msgstr ""
 "prin intermediul protocolului APOP. Aceasta poate s� nu func�ioneze pentru "
 "to�iutilizatorii chiar pe servere care pretind c� suport� acest mod."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Aceasta v� va conecta la serverul POP folosind Kerberos 4 la autentificare."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Autentificare nereu�it� la serverul KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nu m� pot conecta la serverul: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nu m� pot conecta la serverul POP �n %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sV� rog introduce�i parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7008,12 +7233,12 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Necunoscut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7021,7 +7246,7 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7030,22 +7255,22 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� dosarul `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:73
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -7053,175 +7278,175 @@ msgstr ""
 "Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" �n "
 "sistemul local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nu pot crea conexiunea c�tre sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nu pot trimite mesajul: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail oprit cu mesajul %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nu pot executa %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail oprit cu starea %d: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Nu g�sesc adresa 'De la' �n mesaj"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
 "folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintax�, comand� nerecunoscut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Comand� neimplementat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau r�spuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Serviciu preg�tit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Serviciul �nchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Serviciu invalid, canal de transmisie �nchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Ac�iunea cerut� de mail terminat� cu succes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilizatorul nu e local: se va �nainta la <cale-�naintare>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ac�iunea cerut� de mail neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ac�iunea cerut� neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Ac�iunea cerut� anulat�: eroare la procesare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Utilizatorul nu este local; �ncerca�i v� rog <cale-�naintare>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Ac�iunea cerut� refuzat�: posibilitatea de stocare a sistemului dep�it�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Ac�iunea cerut� anulat�: dep�e�te posibilit��ile de stocare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ac�iunea cerut� anulat�: numele c�su�ei de mail nu este permis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "�ncepe�i introducerea mailului; termina�i cu <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Tranzac�ie e�uat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranzi�ie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesit� criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "E�uare temporar� a autentific�rii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "R�spuns de eroare: %s: probabil nu e fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Serverul SMTP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduce�i v� rog parola SMTP pentru %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7232,173 +7457,184 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinit�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "R�spuns de eroare la comanda HELO: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "E�ec la cererea AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "R�spuns de la server: autentificare e�uat�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "R�spuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "R�spuns de eroare la comanda RCPT TO: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "R�spuns de eroare la comanda DATA: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA r�spuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT r�spuns de eroare: %s: nefatal"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u octe�i"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "anex�"
 
-#: composer/e-msg-composer-attachment-bar.c:478
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:509
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:510
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
+#, fuzzy, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: composer/e-msg-composer-attachment.c:176
+#, fuzzy, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Acesta nu este un fi�ier normal."
+
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propriet��ile anexei"
@@ -7416,52 +7652,52 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduce�i adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7474,7 +7710,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexeaz� un fisier"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7483,29 +7719,29 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7513,16 +7749,16 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i dosarul cu ciorne implicit?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7531,7 +7767,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7540,7 +7776,7 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7549,7 +7785,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1165
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7558,7 +7794,7 @@ msgstr ""
 "Evolution a g�sit fi�iere nesalvate �ntr-o sesiune anterioar�.\n"
 "Dori�i s� �ncerc o restaurare?"
 
-#: composer/e-msg-composer.c:1313
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7567,28 +7803,39 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1492
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insereaz� fi�ier"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2404
-msgid "Could not create composer window."
-msgstr "Nu pot crea fereastra de compunere."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
+"nici o identitate �n componen�a mailului."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7596,11 +7843,11 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nu pot ini�ializa compozitorul Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:76
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7656,15 +7903,24 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Memorez aceast� parol�"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -7723,30 +7979,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7792,11 +8048,13 @@ msgid "seconds"
 msgstr "secunde"
 
 #: filter/filter-datespec.c:194
-msgid "Oops. You have forgotten to choose a date."
+#, fuzzy
+msgid "You have forgotten to choose a date."
 msgstr "Oops. A�i uitat s� alege�i o dat�."
 
 #: filter/filter-datespec.c:196
-msgid "Oops. You have chosen an invalid date."
+#, fuzzy
+msgid "You have chosen an invalid date."
 msgstr "Oops. A�i ales o dat� invalid�."
 
 #: filter/filter-datespec.c:271
@@ -7862,7 +8120,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:940
+#: filter/filter-datespec.c:711 mail/message-list.c:939
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -7883,24 +8141,25 @@ msgstr "Atunci"
 msgid "Add action"
 msgstr "Adaug� ac�iune"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
+#, fuzzy
 msgid ""
-"Oops, you forgot to choose a folder.\n"
+"You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Oops, a�i uitat s� alege�i un dosar.\n"
 "V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Introdu dosar URI"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<clic aici s� alege�i un dosar>"
 
@@ -7917,39 +8176,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Nume regul�:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "F�r� titlu"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Dac�"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Execut� ac�iunile"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "dac� toate criteriile sunt �ndeplinite"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Adaug� criteriu"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "intr�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "iese"
 
@@ -8142,7 +8401,7 @@ msgstr "R�spuns la"
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Expeditor"
 
@@ -8174,7 +8433,7 @@ msgstr "�ncepe cu"
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Subiect"
@@ -8187,15 +8446,15 @@ msgstr "a fost dup�"
 msgid "was before"
 msgstr "a fost �nainte"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reguli"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Adaug� reguli"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Editez reguli"
 
@@ -8203,47 +8462,47 @@ msgstr "Editez reguli"
 msgid "Score Rules"
 msgstr "Reguli de punctaj"
 
-#: filter/vfolder-rule.c:206
-msgid "Oops.  You need to to specify at least one folder as a source."
+#: filter/vfolder-rule.c:205
+msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "Component� Evolution pentru manipularea mailului."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Se import�"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "se termin� cu"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Mail"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8251,20 +8510,15 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Elm.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Card: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Agend�"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8272,25 +8526,25 @@ msgstr ""
 "Evolution a g�sit fi�iere fi�iere GnomeCard.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Scanez dosarul IMAP"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "_Data �nceput:"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Set�ri"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8298,11 +8552,11 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Netscape.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8310,7 +8564,7 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Pine.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Tip�re�te"
@@ -8347,231 +8601,256 @@ msgstr "Procesator pentru componenta sumar mail."
 msgid "Mail configuration interface"
 msgstr "Interfa�a de configurare mail"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:129
+#, fuzzy, c-format
+msgid "Cannot connect to store: %s"
+msgstr "Nu m� pot conecta la serverul: %s"
+
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:356
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propriet��i..."
 
-#: mail/component-factory.c:356
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: mail/component-factory.c:698
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:812
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:812
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:843
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1032
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "Cannot initialize Evolution's mail config component."
+msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#: mail/component-factory.c:1012
+#, fuzzy
+msgid "Cannot initialize Evolution's folder info component."
+msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:261
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:263
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: mail/folder-browser.c:262 mail/mail-display.c:275
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nu pot crea directorul temporar: %s"
 
-#: mail/folder-browser.c:734
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d noi"
 
-#: mail/folder-browser.c:737 mail/folder-browser.c:742
-#: mail/folder-browser.c:746
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:738
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d ascunse"
 
-#: mail/folder-browser.c:743
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "�terse"
 
-#: mail/folder-browser.c:748
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:750
+#: mail/folder-browser.c:803
+#, fuzzy, c-format
+msgid "%d sent"
+msgstr "%d netrimise"
+
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:993
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Creaz� filtru din mesaj"
 
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1341
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1344
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1347
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1356
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1359
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Salveaz� ca..."
 
-#: mail/folder-browser.c:1377
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_R�spunde la expeditor"
 
-#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "R�spunde la _list�"
 
-#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "R�spunde la to�i"
 
-#: mail/folder-browser.c:1388
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Marcheaz� ca _necitit"
 
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1397
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1402
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Mut� �n dosar..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1413
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1418
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1422
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:1573
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1574
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Implicit"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8594,18 +8873,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Import fi�ierele Outlook Express 4 �n Evolution"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "con�ine"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formatul curent de stocare:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "_Index"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Format c�su�� de mail"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Format nou de stocare:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8615,15 +8904,15 @@ msgstr ""
 "o problem� (cum ar fi o lips� a spa�iului pe disc) care nu poate\n"
 "fi rezolvat� �n mod automat. V� rug�m folosi�i aceast� facilitate cu grij�."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8641,18 +8930,18 @@ msgstr "Editor de �tiri Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Nu pot deschde fi�ierul semn�tur� %s:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8661,7 +8950,7 @@ msgstr ""
 "Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8677,53 +8966,53 @@ msgstr "Invalideaz�"
 msgid "Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nu �terge"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Chiar �terge�i acest cont?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Set�ri _mail..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8735,7 +9024,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8743,7 +9032,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8751,23 +9040,23 @@ msgstr ""
 "Trebuie s� configura�i transportul mailurilor\n"
 "�nainte pentru a putea compune mailuri. "
 
-#: mail/mail-callbacks.c:185
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Nu a�i setat o metod� de transport a mailului"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:265
 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
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Trimite un email"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8775,18 +9064,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:374
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8798,43 +9087,43 @@ msgstr ""
 "ad�ugarea unui antet Aparent-la.\n"
 "Trimite�i oricum?"
 
-#: mail/mail-callbacks.c:419
+#: mail/mail-callbacks.c:468
 #, fuzzy
 msgid "This message contains invalid recipients:"
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:454
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie s� specifica�i un destinatar pentru a trimite acest mesaj."
 
-#: mail/mail-callbacks.c:550
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Trebuie s� configura�i un cont �nainte pentru a putea s� trimite�i acest mail"
 
-#: mail/mail-callbacks.c:783
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: mail/mail-callbacks.c:788
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1171
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:1173
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� edita�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:1569
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8842,7 +9131,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:1603
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8850,28 +9139,28 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:1615
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� retrimite�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:1636
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:1721
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:1723
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
 
-#: mail/mail-callbacks.c:1873
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8879,12 +9168,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1880
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu m� �ntreba din nou"
 
-#: mail/mail-callbacks.c:1985
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8893,26 +9182,26 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1995
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:2041
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/mail-callbacks.c:2087
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sunte�i sigur c� dori�i s� deschide�itoate cele %d mesaje �n ferestre "
 "separate?"
 
-#: mail/mail-config-druid.c:135
+#: mail/mail-config-druid.c:146
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -8923,7 +9212,7 @@ msgstr ""
 "\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� include�i "
 "aceast� informa�ie �n emailul pe care-l trimite�i"
 
-#: mail/mail-config-druid.c:137
+#: mail/mail-config-druid.c:148
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -8934,11 +9223,11 @@ msgstr ""
 "Dac� nu �ti�i ce fel de server folosi�i, contacta�i administratorul "
 "dumneavoastr� de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:139
+#: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:141
+#: mail/mail-config-druid.c:152
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -8949,7 +9238,7 @@ msgstr ""
 "Dac� nu �ti�i ce protocol folosi�i, contacta�i administratorul dumneavostr� "
 "de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:143
+#: mail/mail-config-druid.c:154
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -8967,17 +9256,17 @@ msgstr ""
 "doar pentru afi�are."
 
 #. set window title
-#: mail/mail-config-druid.c:570
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cont"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8988,16 +9277,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "Inbox"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -9016,31 +9305,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Conturi"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9052,28 +9341,25 @@ msgid "Authentication"
 msgstr "Autentificare"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Tip de autentificare: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Verific mailurile noi"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "ID certificat:"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Compozitor"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9090,235 +9376,245 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Stilul implicit pentru \"�nainteaz�\" este: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "Default character encoding: "
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Afi�eaz�"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Dosar ciorne:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Editeaz�..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "�n mailuri HTML"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "�n linie"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Loca�ie c�su�� po�tal�"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Server NNTP"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "�tiri"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Memorez aceast� parol�"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Op�iuni primire"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Informa�ie cerut�"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Selecteaz� un fi�ier"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Selecteaz� binarul PGP"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Trimis"
 
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Dosar mesaje trimise:"
+
 #: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
 #: mail/mail-config.glade.h:76
-msgid "Sent messages folder:"
-msgstr "Dosar mesaje trimise:"
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Serverul necesit� _autentificare"
 
 #: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configurare server"
 
 #: mail/mail-config.glade.h:78
-msgid "Server Type: "
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Tip server:"
 
 #: mail/mail-config.glade.h:79
-msgid "Server requires _authentication"
-msgstr "Serverul necesit� _autentificare"
-
-#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Fi�ier semn�tur�:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Surs�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Informa�ie surs�"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Surse"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (_SSL)"
+msgid "Use s_ecure connection (SSL)"
 msgstr "Folose�te conectare securizat� (SSL)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9329,124 +9625,148 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "�ntotdeauna �ncarc� imaginile neconectat"
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
 #: mail/mail-config.glade.h:93
 #, fuzzy
-msgid "_Automatically check for new mail every"
-msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
+msgid "_Authentication Type: "
+msgstr "Tip de autentificare: "
 
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Check for supported types"
-msgstr "Verific tipurile suportate"
+msgid "_Automatically check for new mail"
+msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
+
+#: mail/mail-config.glade.h:95
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ID certificat:"
 
 #: mail/mail-config.glade.h:97
 #, fuzzy
+msgid "_Drafts folder:"
+msgstr "Dosar ciorne:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
 msgid "_Email Address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_Empty trash folders on exit"
 msgstr "Gole�te dosarul cu reziduuri la ie�ire"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Ilumineaz� citatele cu "
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazd�:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organiza�ie:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Cale binar� PGP:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez aceast� parol�"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Trimite implicit mail �n format HTML."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Tip server:"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Fi�ier semn�tur�:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Fiecare"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "fereastra-�tiri1"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "plaseaz�"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "secunde"
 
@@ -9486,149 +9806,149 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:223
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Salveaz� pe disc..."
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide �n %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1053
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1515
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:1517
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:1520
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:1523
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
 
-#: mail/mail-format.c:627
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:764
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:903 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:906
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1357
-msgid "No GPG/PGP program configured."
-msgstr "Nu e configurat nici un program GPG/PGP."
-
-#: mail/mail-format.c:1373
-msgid "Encrypted message not displayed"
-msgstr "Mesaj criptat neafi�at"
+#: mail/mail-format.c:898
+#, fuzzy
+msgid "Bcc"
+msgstr "Bcc:"
 
-#: mail/mail-format.c:1384
-msgid "Encrypted message"
-msgstr "Mesaj criptat"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1385
-msgid "Click icon to decrypt."
-msgstr "Clic pe icon pentru decriptare."
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Nu recunosc acest tip de component� a calendarului."
 
-#: mail/mail-format.c:1440
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1451
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator c�tre fi�ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: mail/mail-local.c:563
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: mail/mail-local.c:636
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9637,29 +9957,29 @@ msgstr ""
 "Nu pot salva informa�ia meta a dosarului; probabil c� nu ve�i mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:689
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:735
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1075
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%s\""
 
-#: mail/mail-local.c:1090
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1112
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9667,17 +9987,17 @@ msgstr ""
 "Dac� nu o s� pute�i deschide aceast� c�su�� po�tal�, atunci\n"
 "probabil va trebui s� o repara�i manual."
 
-#: mail/mail-local.c:1200
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nu pute�i copia mesaje din acest dosar"
 
-#: mail/mail-local.c:1209
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9686,7 +10006,7 @@ msgstr ""
 "Eroare �n timpul '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9695,26 +10015,7 @@ msgstr ""
 "Eroare �n timpul opera�iei:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:509
-msgid "Remember this password"
-msgstr "Memorez aceast� parol�"
-
-#: 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 "Introduce�i parola pentru %s"
-
-#: mail/mail-mt.c:570
-#, fuzzy
-msgid "Enter Password"
-msgstr "Introduce�i parola pentru %s"
-
-#: mail/mail-mt.c:886
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Lucrez"
 
@@ -9723,114 +10024,114 @@ msgstr "Lucrez"
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:482 mail/mail-ops.c:512
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:668
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:687
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "E�ec la mesajul %d din %d"
 
-#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:782
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n dosar"
 
-#: mail/mail-ops.c:861
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele �n %s"
 
-#: mail/mail-ops.c:861
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele �n %s"
 
-#: mail/mail-ops.c:878
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Mut"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Copiez"
 
-#: mail/mail-ops.c:993
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Gunoi"
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1215
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1284
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1353
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "�terg dosarul %s"
 
-#: mail/mail-ops.c:1445
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1532
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1581
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1734
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1846
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9839,7 +10140,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9848,11 +10149,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:1964
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9861,17 +10162,17 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
@@ -9880,111 +10181,116 @@ msgstr "Deconectare de la %s"
 msgid "_Search"
 msgstr "_Caut�"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Mesaj f�r� titlu)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Mesaj f�r� titlu)"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "Mesaj"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "G�se�te �n mesaj"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Caut� �nainte"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "G�se�te:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Potriviri:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Renun�..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tip: %s"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Prime�te mailul"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Renun��"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "A�tept..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
 
-#: mail/mail-tools.c:133
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Nu pot crea temporar mbox `%s': %s"
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Introduce�i parola pentru %s"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj �naintat - %s"
 
-#: mail/mail-tools.c:263
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:396
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creez dosar nou"
 
-#: mail/mail-vfolder.c:201
+#: mail/mail-vfolder.c:203
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Scanez dosarele �n \"%s\""
@@ -9998,81 +10304,91 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:636
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "Dosare V"
 
-#: mail/mail-vfolder.c:742
+#: mail/mail-vfolder.c:816
+#, fuzzy
+msgid "Edit VFolder"
+msgstr "Editeaz� dosare V"
+
+#: mail/mail-vfolder.c:832
+#, c-format
+msgid "Trying to edit a vfolder '%s' which doesn't exist."
+msgstr ""
+
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "�naintat: (f�r� subiect)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:639
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:640
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:641
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:642
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:643
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:647
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:648
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:652
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:653
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:903
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:910
 msgid "Today %l:%M %p"
 msgstr "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:919
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:932
+#: mail/message-list.c:931
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:941
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -10099,27 +10415,27 @@ msgstr "Scanez dosarele �n \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonare la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dosar"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost �ters."
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10164,122 +10480,124 @@ msgstr "Dezaboneaz�"
 msgid "Evolution component for the executive summary."
 msgstr "Componenta Evolution pentru sumarul activit��ilor."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nu pot ini�ializa componenta Evolution pentru sumarul activit��ilor."
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "�nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:264
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Nu exist� �nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:301
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:303
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:463
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:929
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/e-summary-preferences.c:937
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
-#: my-evolution/e-summary-preferences.c:941
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Nume:"
 
-#: my-evolution/e-summary-preferences.c:1486
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Rezumatul con�ine"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-tasks.c:238
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Nu exist� sarcini"
 
-#: my-evolution/e-summary-tasks.c:277
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Serverul pentru vreme nu a putut fi contactat</b></dd>"
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regiuni"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Rezumat"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Componenta sumar a activit��ilor nu poate ini�ializa Bonobo.\n"
 
@@ -10339,7 +10657,7 @@ msgstr "Pu�in noros"
 msgid "Overcast"
 msgstr "Cer noros"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Invalid"
 
@@ -10411,1064 +10729,1074 @@ msgstr "Nord Vest"
 msgid "North - Northwest"
 msgstr "Nord - Nord Vest"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "Burni��"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Burni�� �n �mprejurimi"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Burni�� u�oar�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Burni�� moderat�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Burni�� puternic�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "Burni�� superficial�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "Burni�� pe alocuri"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Burni�� par�ial"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Furtun�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Burni�� cu v�nt"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Ploaie toren�ial�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Burni�� viscolit�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Burni�� cu ghea��"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Ploaie"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Ploaie �n �mprejurimi"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Ploaie u�oar�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Ploaie moderat�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Ploaie puternic�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "Ploaie superficial�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "Ploaie pe alocuri"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Avers� de ploaie par�ial�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Ploaie �n rafale"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Avers� de ploaie"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Ploaie viscolit�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Ploaie cu ghea��"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Ninsoare"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Ninge �n �mprejurimi"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Ninsoare u�oare"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Ninsoare moderat�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Ninsoare puternic�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "Ninsoare superficial�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "Ninsoare pe alocuri"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Ninsoare par�ial�"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Furtun� de z�pad�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Ninsoare cu rafale de v�nt"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Avers� de z�pad�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Z�pad� viscolit�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Z�pad� cu ghea��"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Lapovi�� �i ninsoare"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Lapovi�� �i ninsoare �n �mprejurimi"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Lapovi�� �i ninsoare u�oar�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Lapovi�� �i ninsoare moderat�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Lapovi�� �i ninsoare puternic�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "Lapovi�� �i ninsoare superficial�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "Lapovi�� �i ninsoare pe alocuri"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Lapovi�� �i ninsoare par�ial�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Lapovi�� �i ninsoare �n rafale"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Averse de lapovi�� �i ninsoare"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Lapovi�� �i ninsoare viscolit�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Lapovi�� �i ninsoare cu ghea��"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Grindin�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Grindin� �n �mprejurimi"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Grindin� u�oar�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Grindin� moderat�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Grindin� puternic�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "Grindin� superficial�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "Grindin� pe alocuri"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Grindin� par�ial�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Furtun� cu grindin�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Grindin� �n rafale"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Avers� de grindin�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Grindin� viscolit�"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Grindin� cu ghea��"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Grindin� m�runt�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Grindin� m�runt� �n �mprejurimi"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Grindin� m�runt� moderat�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Grindin� m�runt� moderat�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "Grindin� m�runt� superficial�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "Grindin� m�runt� pe alocuri"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Grindin� m�runt� par�ial"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Furtun� cu grindin� m�runt�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Grindin� m�runt� �n rafale"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Averse de grindin� m�runt�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Grindin� m�runt� viscolit�"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Grindin� m�runt� cu ghea��"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Precipita�ie necunoscut�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Precipita�ii �n �mprejurimi"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Precipita�ii u�oare"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Precipita�ii moderate"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Precipita�ii puternice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "Precipita�ie superficial�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "Precipita�ii pe alocuri"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Precipita�ii par�iale"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Furtun� necunoscut�"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Precipita�ii �n rafale"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Avers� de tip necunoscut"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Precipita�ii cu viscol"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Precipit�ii cu ghea��"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Cea��"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Cea�� �n �mprejurimi"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Cea�� u�oar�"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Cea�� moderat�"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "Cea�� dens�"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "Cea�� superficial�"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "Cea�� pe alocuri"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Cea�� par�ial�"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Cea�� cu v�nt"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Cea�� cu viscol"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Cea�� cu ghea��"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Negur�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "Negur� �n �mprejurimi"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "Negur� u�oar�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "Negur� moderat�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "Negur� dens�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "Negur� superficial�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "Negur� pe alocuri"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "Negur� par�ial�"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "Negur� cu v�nt"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "Negur� cu viscol"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "Negur� cu ghea��"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Fum"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Fum �n imprejurimi"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Fum u�or"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Fum moderat"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "Fum dens"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "Fum superficial"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "Fum pe alocuri"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Fum par�ial"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "Fum w/ tunete"
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Fum u�or"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Fum cu v�nt"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Fum viscolit"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Cenu�� vulcanic�"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Cenu�� vulcanic� �n �mprejurimi"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Cenu�� vulcanic� moderat�"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "Cenu�� vulcanic� dens�"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "Cenu�� vulcanic� superficial�"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "Cenu�� vulcanic� pe alocuri"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Cenus� vulcanic� par�ial�"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Cenu�� vulcanic� dens�"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr ""
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Cenu�� vulcanic� pe alocuri"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Cap"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "zile"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
-msgstr ""
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
+msgstr "Grindin� �n �mprejurimi"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
-msgstr ""
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
+msgstr "Ploaie u�oar�"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Ploaie moderat�"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
-msgstr ""
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
+msgstr "Ploaie puternic�"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Ploaie superficial�"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
-msgstr ""
+#: my-evolution/metar.c:358
+#, fuzzy
+msgid "Patches of spray"
+msgstr "Ploaie pe alocuri"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Cea�� par�ial�"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
-msgstr ""
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
+msgstr "Grindin� �n rafale"
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
-msgstr ""
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
+msgstr "Ploaie viscolit�"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Ploaie cu ghea��"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "August"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11479,7 +11807,7 @@ msgstr "�te_rge"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Adaug� o surs� de �tiri"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11497,120 +11825,119 @@ msgstr "Toate dosarele:"
 msgid "All news _feeds:"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
 msgid "How many days should the calendar display at once?"
 msgstr "C�te zile trebuie s� afi�eze calendarul?"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "Num�rul maxim de elemente afi�ate:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "One mont_h"
 msgstr "O lun�"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "One w_eek"
 msgstr "O s�pt�m�n�"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Arat� �ntreaga cale pentru dosare"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Arat� toate sarcinile"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Arat� sarcilnile de azi"
 
-#: my-evolution/my-evolution.glade.h:17
-msgid "Tasks "
-msgstr "Sarcini"
-
 #: my-evolution/my-evolution.glade.h:18
-msgid "Units: "
-msgstr "Unit��i: "
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
+msgid "Tasks "
+msgstr "Sarcini"
+
+#: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr "Set�ri vreme"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Display folders:"
 msgstr "Afi�eaz� dosarele:"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Display stations:"
 msgstr "Afi�eaz� sta�iile:"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Displayed feeds:"
 msgstr "Afi�eaz� dosarele:"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:25
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_Five days"
 msgstr "Cinci zile"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "_Mail"
 msgstr "Mail"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:28
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Dosar _nou"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:29
 #, fuzzy
 msgid "_One day"
 msgstr "O zi"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:30
 #, fuzzy
 msgid "_Schedule"
 msgstr "Program"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:31
 #, fuzzy
 msgid "_Weather"
 msgstr "Vremea"
 
-#: my-evolution/my-evolution.glade.h:30
-msgid "_imperial"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:31
-#, fuzzy
-msgid "m_etric"
-msgstr "metric"
-
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
@@ -11623,25 +11950,25 @@ msgstr "Arat� detalii"
 msgid "Cancel Operation"
 msgstr "Anulare opera�ie"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Instalare Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11649,17 +11976,17 @@ msgstr ""
 "Acest� versiune de Evolution are nevoie s� instaleze fi�iere �n plus\n"
 "�n directorul dumneavoastr� personal"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierele, sau \"Renun��\" "
 "pentru ie�ire"
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11670,7 +11997,7 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11679,7 +12006,7 @@ msgstr ""
 "A ap�rut o eroare �n timpul copierii fi�ierului �n\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11690,7 +12017,7 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11699,7 +12026,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11710,6 +12037,19 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Nu pot muta un dosar peste el �nsu�i."
@@ -11722,25 +12062,25 @@ msgstr "Nu copia un dosar peste el �nsu�i."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Preciza�i un dosar pentru a copia dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:317
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Copiaz� dosarul"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Preciza�i un dosar pentru a muta dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Mut� dosarul"
 
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11749,18 +12089,18 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "�terg"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:416
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sunte�i sigur c� dori�� s� �terge�i dosarul `%s'?"
 
-#: shell/e-shell-folder-commands.c:470
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11769,16 +12109,22 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:503
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:506
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Redenum�te dosarul '%s'"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Numele dosarului specificat este invalid."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11788,34 +12134,11 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Nici un destinatar specificat"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "Nu pot deschide directorul cache: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Numele dosarului specificat este invalid."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare dosar nou"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11823,19 +12146,19 @@ msgstr ""
 "Tipul fi�ierului selectat nu e valid pentru\n"
 "opera�ia cerut�."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(F�r� titlu)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11849,13 +12172,13 @@ msgstr ""
 "Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
 "determine automat."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11866,7 +12189,7 @@ msgstr ""
 "Importator nepreg�tit.\n"
 "A�tepta�i 5 secunde s� �ncerc din nou."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11875,16 +12198,16 @@ msgstr ""
 "Se import� %s\n"
 "Se import� articol %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11893,11 +12216,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11906,17 +12229,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11925,140 +12248,146 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "Import fi�iere"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "�nchid conexiunile..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Nici un destinatar specificat"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Nu pot deschide directorul cache: %s"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nu a fost g�sit �n $PATH."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, 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:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution e un grup de programe ce include aplica�ii\n"
-"pentru mail, calendar �i managementul contactelor\n"
-"�n mediul desktop GNOME"
+msgid "About Ximian Evolution"
+msgstr "Despre Evolution..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Alege�i dosarul pe care dori�i s�-l deschide�i"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Alege�i dosarul spre care dori�i s� indice scurt�tura:"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Lucreaz� deconectat"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Lucreaz� deconectat"
 
@@ -12066,27 +12395,17 @@ msgstr "Lucreaz� deconectat"
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1512
+#: shell/e-shell-view.c:1574
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1514
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1519
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution - %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:1561
+#: shell/e-shell-view.c:1623
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -12094,12 +12413,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1568
+#: shell/e-shell-view.c:1630
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1636
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -12107,50 +12426,45 @@ msgstr ""
 "Evolution este actualmente deconectat. Da�i clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:562
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1488
-#, fuzzy, c-format
+#: shell/e-shell.c:1659
+#, c-format
 msgid ""
-"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
 msgstr ""
-"Ooops! Vizualizarea pentru `%s' a murit nea�teptat. :-(\n"
-"Aceasta �nseamn� c� probabil componenta %s a cr�pat."
-
-#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
 
-#: shell/e-shell.c:1694
+#: shell/e-shell.c:1886
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/e-shell.c:1696
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1698
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1700 shell/e-storage.c:496
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Eroare generic�"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi."
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12159,113 +12473,113 @@ msgstr ""
 "Chiar dori�i s� �nl�tura�i grupul\n"
 "`%s' din bara de scurt�turi?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Nu �nl�tura"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Redenume�te grupul de scurt�turi"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Redenume�te grupul de scurt�turi selectat �n:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Iconuri mici"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Arat� scurt�turile ca iconuri mici"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Iconuri mari"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Arat� scurt�turile ca iconuri mari"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "�nl�tur� acest g_rup..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Rede_nume�te acest grup..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Redenume�te acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Redenume�te scurt�tura"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Redenume�te scurt�tura selectat� �n:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Deschide dosarul legat la aceast� scurt�tur�."
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Deschide �n fereastr� noua"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Deschide dosarul legat la aceast� scurt�tur� �ntr-o fereastr� nou�"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenume�te"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Redenume�te aceast� scurt�tur�"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "�terge"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� scurt�tur� din bara de scurt�turi"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurt�turilor."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Scurt�turi"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12274,66 +12588,172 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(F�r� nume)"
 
-#: shell/e-storage.c:494
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:516
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:524
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "Eroare I/O"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "Con�inut invalid al mesajului"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Nimeni"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Nu g�sesc fi�ierul"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Verific tipurile suportate"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Opera�ie anulat� de utilizator."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Alt� eroare"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "Exist�"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Invalid"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Nu exist� dosarul %s"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Nici un mesaj selectat"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Eroare necunoscut�"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Conexiuni active"
@@ -12438,89 +12858,72 @@ msgstr ""
 "Cu acest asistent ve�i fi ghidat prin procesul de\n"
 "import al fi�ierelor extene �n Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importatori"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Nu importa"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Nu m� �ntreba din nou"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution a g�sit urm�toarea surs� de date:"
 
-#: shell/main.c:82
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Set�ri Evolution..."
 
-#: shell/main.c:153
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Salut. Mul�umesc pentru timpul acordat pentru desc�rcarea acestui\n"
-"PREVIEW RELEASE al suitei Evolution.\n"
-"\n"
-"Evolution nu e �nc� complet. E pe aproape, dar exist� locuri unde\n"
-"facilit��ile sau lipsesc sau sunt �nc� �n lucru. \n"
-"\n"
-"Dac� g�si�i erori, v� rug�m raporta�i-le la bugzilla.ximian.com.\n"
-"Acest produs vine f�r� nici o garan�ie �i nu e destinat\n"
-"persoanelor predispuse la violen�� �i sup�r�cioase.\n"
-"\n"
-"Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
-"cu ner�bdare contribu�ia dumneavostr�!\n"
-
-#: shell/main.c:174
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"V� mul�umim\n"
-"Echipa Evolution\n"
-
-#: shell/main.c:231
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:242
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:286
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecranul de pornire"
 
-#: shell/main.c:287
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ie�irile pentru depanare ale tuturor componentelor �ntr-un fi�ier."
 
-#: shell/main.c:329
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Eroare la �nc�rcarea fi�ierului: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Deschide fi�ier"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Insereaz� fi�ier"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Nici un destinatar specificat"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12615,7 +13018,7 @@ msgstr "Opre�te �nc�rcarea"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Ac�iuni"
@@ -12639,7 +13042,7 @@ msgid "_Forward Contact..."
 msgstr "_Contacte..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Tip�re�te..."
@@ -12690,7 +13093,7 @@ msgstr "Zi"
 msgid "Delete the appointment"
 msgstr "�terge aceast� �nt�lnire"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Mergi la"
 
@@ -12825,11 +13228,12 @@ msgstr "Tip�re�te"
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Salveaz�"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Salveaz� �i �nchide"
 
@@ -12846,7 +13250,7 @@ msgstr "Salveaz� acest articol pe disc"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fi�ier"
@@ -12868,7 +13272,7 @@ msgstr "Salveaz� contact �i �nchide c�su�a de dialog"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salveaz�"
 
@@ -12928,10 +13332,6 @@ msgstr "Programare �nt�lniri"
 msgid "Customise My Evolution"
 msgstr "Personalizeaz� Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Renun��"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Renun�� la opera�ia de mail curent�"
@@ -13190,292 +13590,322 @@ msgstr "Creaz� un dosar virtual pentru acest expeditor"
 msgid "Create a virtual folder for this subject"
 msgstr "Creaz� un dosar virtual pentru acest subiect"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Afi�eaz� urm�torul mesaj important"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Afi�eaz� urm�torul mesaj"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Afi�eaz� urm�toarea �nl�n�uire necitit�"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Afi�eaz� mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Afi�eaz� mesajul precedent"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Afi�eaz� mesajul necitit precedent"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Filtreaz� _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Filtreaz� expeditorul..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Filtreaz� destinatarul..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Filtreaz� _subiectul..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "For�eaz� �nc�rcarea imaginilor �n HTML"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "�nainteaz�"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "�nainteaz� ca"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "�nainteaz� _anexat"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "�nainteaz� _inline"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "�nainteaz� cotat"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "�nainteaz� mesajul selectat cotat ca r�spuns"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "�nainteaza mesajul selectat c�tre cineva"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "�nainteaz� mesajul selectat c�tre cineva ca o anex�"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Insereaz� fi�ier text..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "�ncarc� _imaginile"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marcheaz� ca important"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marcheaz� ca important"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Marcheaz� mesajele selectate ca citite"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Marcheaz� mesajele selectate ca importante"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcheaz� mesajele selectate ca necitite"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcheaz� mesajele selectate ca importante"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "MArcheaz� mesajele selectate pentru �tergere"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Mut�"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Mut� mesajele selectate �n alt dosar"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Urm�torul"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Afi�eaz� urm�torul mesaj important"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "Mesaj"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "Selec_teaz� �nl�n�uirea"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Deschde mesajul selectat �ntr-o fereastr� nou�"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Deschide mesajul selectat �n compositor pentru a-l retrimite"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Precedent"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Afi�eaz� mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "Tip�re�te mesaj"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Afi�eaz� mesajul necitit precedent"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "Tip�re�te mesaj"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "R�spunde"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "R�spunde la to�i"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Caut� m_esajul"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Salveaz� mesajul ca un fi�ier text"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Caut� textul �n corpul mesajului afi�at"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Set�ri de pagin� pentru imprimanta curent�"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Arat� sursa mesajului"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Arat� toate antetele"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Arat� mesajul �ntr-un stil normal"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Arat� mesajul cu toate antetele mesajului"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "Ata�eaz� sursa primar� a mesajului a mesajului"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Recupereaz� mesajele selectate"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "Dosar V pentru _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "Dosar V pentru expeditor..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "Dosar V pentru destinata_ri..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "Dosar V pentru _subiect..."
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Aplic� filtrele"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "Copiaz� �n folder"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "_Creaz� filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "�nainteaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Pager"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "_Mut� in dosar"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "Afi�are normal�"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Unelte"
@@ -13486,7 +13916,7 @@ msgstr "�nchide aceast� fereastr�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�n_chide"
@@ -13517,11 +13947,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cripteaz� acest mesaj cu certificatul de criptare S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "F_ormat"
+#, fuzzy
+msgid "For_mat"
+msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13570,7 +14002,7 @@ msgid "Save in folder..."
 msgstr "Salveaz� �n dosar..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Salveaz� fi�ierul curent"
 
@@ -13664,7 +14096,7 @@ msgid "_From Field"
 msgstr "C�mpul De la"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insereaz�"
 
@@ -13680,7 +14112,7 @@ msgstr "C�mpul _R�spuns la"
 msgid "_Security"
 msgstr "_Securitate"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -13922,10 +14354,6 @@ msgstr "_Scurt�tur�"
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Lucreaz� deconectat"
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -14003,135 +14431,139 @@ msgstr ""
 "selecta�i ora local�.\n"
 " Folosi�i butonul din dreapta al mausului pentru a mic�ora."
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Vizualizarea _curent�"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Define�te vizualiz�ri"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Acum"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Ast�zi"
 
-#: widgets/misc/e-cell-date-edit.c:732
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ora trebuie s� fie �n formatul: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Valorile procentuale pot fi �ntre 0 �i 100, inclusiv"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltic"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Europa central�"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinez"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Chirilic"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grec"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonez"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Corean"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turc"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicod"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Europa de vest"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradi�ional"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Simplificat"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ucrainean"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nou"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set de caractere necunoscut: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Introduce�i setul de carcatere de folosit"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Alte..."
 
-#: widgets/misc/e-charset-picker.c:394
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Codare caractere"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "Caut� �nainte"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Afi�eaz� tot"
 
@@ -14165,29 +14597,205 @@ msgstr "_C�utare"
 msgid "Find Now"
 msgstr "Leg�tura DN:"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Serverul personal agend� de adrese"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Serverul personal calendar; procesatorul pentru calendar"
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nu pot ini�ializa GNOME_VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nu pot ini�ializa GNOME"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "informa�ie calendar"
+#~ msgid "Please enter your email address and password for access to %s"
+#~ msgstr "V� rog introduce�i parola pentru %s"
+
+#, fuzzy
+#~ msgid "LDAP Authentication"
+#~ msgstr "Autentificare"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Parola"
+
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr ""
+#~ "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s �i se termin� "
+#~ "la %s"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Notificare depre �nt�lnirea dumneavoastr� ce se trmin� la %s"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Notificare depre �nt�lnirea dumneavoastr�"
+
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr ""
+#~ "Notificare depre sarcina dumneavoastr� ce �ncepe la %s �i se termin� la %s"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Notificare depre sarcina dumneavoastr� ce �ncepe la %s"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Notificare depre sarcina dumneavoastr� ce �ncepe la %s"
+
+#~ msgid "Notification about your task"
+#~ msgstr "Notificare despre sarcina dumneavoastr�"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarma �n %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Eroare necunoscut�"
+
+#~ msgid "Sent By:"
+#~ msgstr "Trimis de:"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Invit� pe al�ii..."
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confiden�ial"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Descriere:"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Fi�ier �n format qmail maildir"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Rezumare dosar"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Nu pot deschide dosarul: %s: rezumare de la pozi�ia %ld: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Nu pot rezuma dosarul: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Nu pot crea fereastra de compunere."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Card: "
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Nu e configurat nici un program GPG/PGP."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Mesaj criptat neafi�at"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Mesaj criptat"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Clic pe icon pentru decriptare."
+
+#~ msgid "Couldn't create temporary mbox `%s': %s"
+#~ msgstr "Nu pot crea temporar mbox `%s': %s"
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Nu pot ini�ializa componenta Evolution pentru sumarul activit��ilor."
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "Fum w/ tunete"
+
+#~ msgid "Units: "
+#~ msgstr "Unit��i: "
+
+#, fuzzy
+#~ msgid "m_etric"
+#~ msgstr "metric"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution e un grup de programe ce include aplica�ii\n"
+#~ "pentru mail, calendar �i managementul contactelor\n"
+#~ "�n mediul desktop GNOME"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution - %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
+#~ "This probably means that the %s component has crashed."
+#~ msgstr ""
+#~ "Ooops! Vizualizarea pentru `%s' a murit nea�teptat. :-(\n"
+#~ "Aceasta �nseamn� c� probabil componenta %s a cr�pat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Salut. Mul�umesc pentru timpul acordat pentru desc�rcarea acestui\n"
+#~ "PREVIEW RELEASE al suitei Evolution.\n"
+#~ "\n"
+#~ "Evolution nu e �nc� complet. E pe aproape, dar exist� locuri unde\n"
+#~ "facilit��ile sau lipsesc sau sunt �nc� �n lucru. \n"
+#~ "\n"
+#~ "Dac� g�si�i erori, v� rug�m raporta�i-le la bugzilla.ximian.com.\n"
+#~ "Acest produs vine f�r� nici o garan�ie �i nu e destinat\n"
+#~ "persoanelor predispuse la violen�� �i sup�r�cioase.\n"
+#~ "\n"
+#~ "Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
+#~ "cu ner�bdare contribu�ia dumneavostr�!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "V� mul�umim\n"
+#~ "Echipa Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormat"
 
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr "Prioritatea poate fi 'Ridicat', 'Normal', 'Sc�zut', 'Nedefinit'."
@@ -14404,19 +15012,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %m/%d/%Y"
 
-#, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
 #~ msgid "Elm mail"
 #~ msgstr "Mail Elm"
 
 #~ msgid "Pine mail"
 #~ msgstr "Mail Pine"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Procesator pentru componenta de mail Evolution."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Mesaj �naintat:\n"
 
@@ -14574,12 +15175,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Delegated From:"
 #~ msgstr "Delegat de la:"
 
-#~ msgid "No one"
-#~ msgstr "Nimeni"
-
-#~ msgid "Task"
-#~ msgstr "Sarcin�"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% Terminat:"
 
@@ -14746,21 +15341,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "_Contact (FIXME)"
 
-#~ msgid "_Index"
-#~ msgstr "_Index"
-
 #~ msgid "_Mail message"
 #~ msgstr "Mesaj _mail"
 
 #~ msgid "_Task (FIXME)"
 #~ msgstr "_Sarcin� (FIXME)"
 
-#~ msgid "File not found"
-#~ msgstr "Nu g�sesc fi�ierul"
-
-#~ msgid "Open calendar"
-#~ msgstr "Deschide calendar"
-
 #~ msgid "Save calendar"
 #~ msgstr "Salveaz� calendarul"
 
@@ -14957,15 +15543,9 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Component� �tears� cu succes."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Nu recunosc acest tip de component� a calendarului."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Adaug� �n calendar"
 
-#~ msgid " Tentative "
-#~ msgstr " Inten�ie "
-
 #~ msgid "Update Calendar"
 #~ msgstr " Actualizeaz� calendar"
 
@@ -15004,9 +15584,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Send as:"
 #~ msgstr "Timite ca:"
 
-#~ msgid "That is not a regular file."
-#~ msgstr "Acesta nu este un fi�ier normal."
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Acest fi�ier exist� dar nu se poate citi."
 
diff --git a/po/ru.po b/po/ru.po
index 299eee0036..381338a197 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-10-27 15:19+0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-27 17:10+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -28,290 +28,296 @@ msgstr "������� ��� ������� ������ VCard � Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "����������� ����� VCard � Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "���� ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "��.�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "�������� ������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "������� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "���. ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "�������� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "������� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "���. 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "�������� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1602
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "������ ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1633
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "��.����� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1634
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "��.����� 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "���� � ��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "������(�)"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI ���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "���������:"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "���� ��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "��������: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -319,7 +325,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -327,7 +333,7 @@ msgstr ""
 "\n"
 "  �������:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -335,7 +341,7 @@ msgstr ""
 "\n"
 "  ���: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -343,7 +349,7 @@ msgstr ""
 "\n"
 "  ����������: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -351,7 +357,7 @@ msgstr ""
 "\n"
 "  �������:    "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -359,7 +365,7 @@ msgstr ""
 "\n"
 "  �������:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -367,7 +373,7 @@ msgstr ""
 "\n"
 "���� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -375,7 +381,7 @@ msgstr ""
 "\n"
 "�����:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -383,7 +389,7 @@ msgstr ""
 "\n"
 "�������� ����:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -391,7 +397,7 @@ msgstr ""
 "\n"
 "  ����.:        "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -399,7 +405,7 @@ msgstr ""
 "\n"
 "  �����:     "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -407,7 +413,7 @@ msgstr ""
 "\n"
 "  �����:      "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -415,7 +421,7 @@ msgstr ""
 "\n"
 "  �������:      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -423,7 +429,7 @@ msgstr ""
 "\n"
 "  �������� ���: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -431,7 +437,7 @@ msgstr ""
 "\n"
 "  ������:     "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -439,7 +445,7 @@ msgstr ""
 "\n"
 "����� ��� ��������:"
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -447,7 +453,7 @@ msgstr ""
 "\n"
 "��������:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -455,7 +461,7 @@ msgstr ""
 "\n"
 "�������:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -463,7 +469,7 @@ msgstr ""
 "\n"
 "��.�����:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -471,7 +477,7 @@ msgstr ""
 "\n"
 "��.�����:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -479,7 +485,7 @@ msgstr ""
 "\n"
 "�������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -487,7 +493,7 @@ msgstr ""
 "\n"
 "������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -495,7 +501,7 @@ msgstr ""
 "\n"
 "�����.���������: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -503,7 +509,7 @@ msgstr ""
 "\n"
 "���������: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -511,7 +517,7 @@ msgstr ""
 "\n"
 "���.:"
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -519,7 +525,7 @@ msgstr ""
 "\n"
 "  ���:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -527,7 +533,7 @@ msgstr ""
 "\n"
 "�������:  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -535,7 +541,7 @@ msgstr ""
 "\n"
 "�������2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -543,7 +549,7 @@ msgstr ""
 "\n"
 "�������3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -551,7 +557,7 @@ msgstr ""
 "\n"
 "�������4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -559,7 +565,7 @@ msgstr ""
 "\n"
 "���������: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -577,7 +583,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -585,7 +591,7 @@ msgstr ""
 "\n"
 "���������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -593,11 +599,11 @@ msgstr ""
 "\n"
 "��������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -606,18 +612,18 @@ msgstr "VCard ��� %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:1518
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1423
-#: calendar/conduits/todo/todo-conduit.c:1125
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� ���������������� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "�����..."
 
@@ -630,60 +636,60 @@ msgstr "��������..."
 msgid "Error in search expression."
 msgstr "������ � ��������� ������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "����������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "���������� ������������ � ������� LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "�������� ����������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "���������� �������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "�������� �������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "��������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "���������� ������."
 
-#: addressbook/conduit/address-conduit.c:285
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "������ �� ����� ���� ��������\n"
 
-#: addressbook/conduit/address-conduit.c:298
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook �� ���������\n"
 
-#: addressbook/conduit/address-conduit.c:1075
-#: calendar/conduits/calendar/calendar-conduit.c:965
-#: calendar/conduits/todo/todo-conduit.c:690
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "�� ������� ��������� ������ wombat"
 
-#: addressbook/conduit/address-conduit.c:1076
-#: calendar/conduits/calendar/calendar-conduit.c:966
-#: calendar/conduits/todo/todo-conduit.c:691
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "�� ������� ��������� wombat"
 
-#: addressbook/conduit/address-conduit.c:1106
-#: addressbook/conduit/address-conduit.c:1109
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "���������� �������� ���� ���������� ������� ������"
 
@@ -728,38 +734,39 @@ msgstr "������� ��� ����������� ���� ������ �� �������� �����"
 msgid "Factory for the sample Addressbook control"
 msgstr "�������� ����� ��� �������� �����"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:301
-#: calendar/gui/dialogs/comp-editor-util.c:357 shell/e-shortcuts.c:1061
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "����� ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "������ LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP ������ ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "����� �������"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "����� �������"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "����� ������ ���������"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "����� ������ ���������"
 
@@ -792,7 +799,7 @@ msgid "Base"
 msgstr "������"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "��������"
 
@@ -807,7 +814,8 @@ msgstr "��.�����:"
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution ����� ������������ ���� ��.����� ��� ������������� ��� �� �������"
+msgstr ""
+"Evolution ����� ������������ ���� ��.����� ��� ������������� ��� �� �������"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
@@ -831,7 +839,8 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:16
 msgid "The information below is required in order to add an addressbook.  "
-msgstr "�����ģ���� ���� ���������� ���������� ��� ���������� � �������� �����."
+msgstr ""
+"�����ģ���� ���� ���������� ���������� ��� ���������� � �������� �����."
 
 #: addressbook/gui/component/addressbook-config.glade.h:17
 msgid "This information is not required for most ldap servers. "
@@ -880,7 +889,7 @@ msgstr "��������"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "������"
@@ -897,32 +906,20 @@ msgstr "����:"
 msgid "_Server name:"
 msgstr "�������� �������:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid "label18"
-msgstr "�����26"
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "label19"
-msgstr "�����26"
-
-#: addressbook/gui/component/addressbook-config.glade.h:31
-msgid "label20"
-msgstr "�����26"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "label47"
-msgstr "�����26"
-
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ������� ���������������� gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:465
+#: addressbook/gui/component/addressbook-storage.c:167
+msgid "Other Contacts"
+msgstr "������ ��������"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�� ������� ������� �������� �����"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -932,7 +929,7 @@ msgstr ""
 "��� ���� �� ����� ������������ URI, ���� LDAP\n"
 "������ �� ��������"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -944,7 +941,7 @@ msgstr ""
 "����������������� ��������� �� �������� ������� � CVS �����\n"
 "��������� OpenLDAP ����������� �� �����ģ���� ���� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -952,42 +949,42 @@ msgstr ""
 "�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
 "� ��� � ��� ���� ����������� ����� �������."
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������� ���� ��������� ����� ��� %s (������������ %s)"
 
-#: addressbook/gui/component/addressbook.c:757
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "����� ���� ��������"
 
-#: addressbook/gui/component/addressbook.c:758
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "��� ��������"
 
-#: addressbook/gui/component/addressbook.c:759
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "��.����� ��������"
 
-#: addressbook/gui/component/addressbook.c:760
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "��������� "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "�����������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
 
@@ -1000,51 +997,51 @@ msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
 msgid "(none)"
 msgstr "(���)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "������ ��.�����"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "������� ��������"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "������� ����� ������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "�������� ����� � ������������� �������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:883
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "������ � �������� �����..."
 
-#: addressbook/gui/component/e-address-popup.c:959
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "������ ���������� ����������"
 
-#: addressbook/gui/component/e-address-popup.c:989
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "�������� � ���������"
 
-#: addressbook/gui/component/e-address-popup.c:1032
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "���������� ��.������"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "��������� �������"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "�������� ������� (������!)"
 
@@ -1056,35 +1053,35 @@ msgstr "��������� ������ ����� � �������� ����� Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "�������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "������� ���"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "�������� ��.����� � HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "������ ������ ���������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "����������� ������ ���������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d �� ��������)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "����������� �������"
 
@@ -1098,7 +1095,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1158,12 +1163,12 @@ msgstr "��������������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "�������� ���������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "������"
 
@@ -1185,7 +1190,8 @@ msgid ""
 "Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"���� ���� ������� ��������� ���������� � ��� ����� �� ��������/����� � Internet, ������� �����\n"
+"���� ���� ������� ��������� ���������� � ��� ����� �� ��������/����� � "
+"Internet, ������� �����\n"
 "����� ���� ����������."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
@@ -1232,8 +1238,8 @@ msgstr "��������..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:702 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1292,49 +1298,57 @@ msgid "_Web page address:"
 msgstr "����� 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 ""
+"�� �������, � ��� ��� ������\n"
+"������� ���� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "������� �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "���� ������� ����������� ��������� ����������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2230
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ������� ����� ������ ��� ����: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "������� ���������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "������ ������� �����"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "������ ���:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "��.�����"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:202
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2402,7 +2416,7 @@ msgid "contact-list-editor"
 msgstr "�������� ������� ���������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "�������� ������� ���������"
 
@@ -2451,12 +2465,12 @@ msgstr ""
 "�������� ��.����� ��� ��� ����� ����������� ���� ���\n"
 "���������� � ���� �����. �ӣ ����� ������ ��������?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "����������� �����"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
 #: mail/mail-search.c:263
 msgid "Search"
 msgstr "�����"
@@ -2476,9 +2490,9 @@ msgstr "%d ��������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "��������� ��� VCard"
@@ -2489,18 +2503,18 @@ msgid "Open"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "��������� �������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "������� ��������� � ��������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2508,12 +2522,12 @@ msgid "Print"
 msgstr "������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "������ ��������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:282 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:17
@@ -2521,81 +2535,87 @@ msgstr "������ ��������"
 msgid "Delete"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:476
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ��� ��������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:971
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "����������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "�������� ��� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "����� � �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "�������� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "������������� �������� ��� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "�������� �� ��������������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1201
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "������ ��������� ���������?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "������ ��� ���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "������ ��� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "������ ��� �������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "������ ��� �������� ��������"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �"
 
@@ -2603,84 +2623,84 @@ msgstr ",123,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �"
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,��,��,��,��,��,��,��,��,��,��,��,��,��,��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* �������� ����� ��� ���������� �������� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "������ �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "�������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "�������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "������� � ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "�������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "������ ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "������ ������"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "� %d ������ ��������."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "� ���� ������ ��������."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "��������� � �������� �����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2866,59 +2886,63 @@ msgstr "������:"
 msgid "_Font..."
 msgstr "�����..."
 
-#: addressbook/printing/e-contact-print.glade.h:43
-#: my-evolution/my-evolution.glade.h:32
-msgid "label26"
-msgstr "�����26"
-
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "���������� ��������"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "���������� ��������"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "������ ��������"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "������ �������"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "�������"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1701
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "����������"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "��������������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:923
+#: calendar/conduits/calendar/calendar-conduit.c:935
 #: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ����������� � ������� ���������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1050
-#: calendar/conduits/calendar/calendar-conduit.c:1053
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "���������� �������� ���� ���������� ��������� ������"
 
-#: calendar/conduits/todo/todo-conduit.c:752
-#: calendar/conduits/todo/todo-conduit.c:755
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "���������� �������� ���� ���������� ������� ������"
 
@@ -2977,11 +3001,26 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr "���������� ���������������� �������� ����� Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "���������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "������������ �����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "���������� ���������"
@@ -3003,11 +3042,11 @@ msgstr "����� �������� (�����)"
 msgid "_Edit appointment"
 msgstr "������ �������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "�������� �� ��������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3015,7 +3054,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3026,110 +3065,117 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "�� ������� ���������������� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�� ������� ������� ���� ���������. ���������� ��������� ���� ��������� ORBit "
 "� OAF."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "����������������"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-meeting-time-sel.c:410
-#: shell/evolution-shell-component.c:993
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "�� ������"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "� ��������"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3140,52 +3186,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1193 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "���"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2010 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "�����"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "�������� ���"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "�������� ������� ������"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "�������� ������"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "�������� ������"
 
@@ -3201,47 +3249,48 @@ msgstr "�������� ��������"
 msgid "Comment contains"
 msgstr "���������� ��������"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:246
-#: my-evolution/e-summary-tasks.c:262 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�������"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "����� ���������� �������� \"���������\""
 
-#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "������� ����� �������"
 
-#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3447
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "������� ����� �������"
 
-#: calendar/gui/component-factory.c:650
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "����� �������"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ������� ����� ���������� ���������"
 
@@ -3312,110 +3361,110 @@ msgstr "����"
 msgid "minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d �����"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 ���"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d �����"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: 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:378
+#: 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:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "��������� �����"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: 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:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "����������� �������� ��� ����������"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: 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:407
+#: 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:412
+#: 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:421
+#: 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:424
+#: 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:429
+#: 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:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3436,7 +3485,7 @@ msgstr "�����������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "����:"
 
@@ -3466,15 +3515,11 @@ msgstr "���������� �������"
 msgid "hour(s)"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-msgid "label55"
-msgstr "�����26"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "������ �������"
 
@@ -3524,7 +3569,7 @@ msgid "First day of wee_k:"
 msgstr "������ ���� ������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "�������"
 
@@ -3537,7 +3582,7 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "�����������"
 
@@ -3546,7 +3591,7 @@ msgid "O_verdue tasks:"
 msgstr "������������ �������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "�������"
 
@@ -3569,7 +3614,7 @@ msgid "Su_n"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "�����������"
 
@@ -3587,7 +3632,7 @@ msgid "Tas_ks due today:"
 msgstr "������� ������������� �� �������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "�������"
 
@@ -3608,12 +3653,12 @@ msgid "Time format:"
 msgstr "������ �������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "�������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "�����"
 
@@ -3682,121 +3727,121 @@ msgstr "���"
 msgid "before the start of the appointment"
 msgstr "�� ������ �������"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� �������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� �������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� ���������� ������?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "��� ������� ���� �������."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "��� ������� ���� �������."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "��� ���������� ������ ���� �������."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s �� ������� ���������. ������ � ��� � ������� ��������?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s �� ������ �� ��������. ������� ��������?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "��� ������� ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "��� ������� ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "��� ���������� ������ ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:179 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:183 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (��������� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:185 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "��������� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:190 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "����������� ����"
 
-#: calendar/gui/dialogs/comp-editor.c:304
+#: calendar/gui/dialogs/comp-editor.c:303
 #, fuzzy
 msgid "Could not update object!"
 msgstr "���������� �������� ����� ���������"
 
-#: calendar/gui/dialogs/comp-editor.c:672
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "������ �������"
 
-#: calendar/gui/dialogs/comp-editor.c:677
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:680
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���������� ������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "��� �����"
 
-#: calendar/gui/dialogs/comp-editor.c:1047 mail/mail-callbacks.c:1845
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "���������� ����?"
 
-#: calendar/gui/dialogs/comp-editor.c:1051 mail/mail-callbacks.c:1852
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3805,53 +3850,53 @@ msgstr ""
 "���� � ����� ��������� ��� ����������.\n"
 "���������� ���?"
 
-#: calendar/gui/dialogs/comp-editor.c:1095 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "��������� ���..."
 
-#: calendar/gui/dialogs/comp-editor.c:1250
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� �������?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� �������?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ���������� ������ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� ���������� ������?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "�� ������� � ���, ��� ������ ������� %d ������?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "�� ������� � ���, ��� ������ ������� %d �������?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�� ������� � ���, ��� ������ ������� %d ���������� �������?"
@@ -3870,26 +3915,26 @@ msgstr "�������..."
 msgid "Enter Delegate"
 msgstr "���������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "�������� ������� � ����������"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "���������"
 
@@ -3903,6 +3948,7 @@ msgstr "�����"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "�������������"
 
@@ -3931,6 +3977,7 @@ msgid "Pu_blic"
 msgstr "�����"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "�������� ����� ���"
 
@@ -3947,19 +3994,88 @@ msgstr "����� ���������:"
 msgid "_Start time:"
 msgstr "����� ������:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "���� ������� ��� ��������� � ���������!"
 
-#: calendar/gui/dialogs/meeting-page.c:697
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "�������..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "��� �������������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* �������� ����� ��� ���������� �������� *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#, fuzzy
+msgid "Common Name"
+msgstr "�������� �ޣ��"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated From"
+msgstr "���������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Delegated To"
+msgstr "���������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "����"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "����"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "����"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+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
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "���"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -3970,36 +4086,37 @@ msgid "_Change Organizer"
 msgstr "�������� ������������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "���������� ������"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "���������� ������..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "������ �����������"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
 "� Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:933
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "�"
 
-#: calendar/gui/dialogs/recurrence-page.c:959 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1097
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "������"
 
@@ -4048,42 +4165,35 @@ msgid "forever"
 msgstr "������"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid "label21"
-msgstr "�����26"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "���"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "������ ��������� ���������?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ����������:"
@@ -4097,7 +4207,7 @@ msgid "Progress"
 msgstr "�����������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4109,14 +4219,14 @@ msgstr "���������:"
 msgid "_Status:"
 msgstr "���������:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:230
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "���������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
@@ -4130,34 +4240,89 @@ msgstr "���� ������:"
 msgid "_Due Date:"
 msgstr "����������� ����:"
 
-#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
 #: calendar/gui/e-week-view.c:1822
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "������� ��������� ��������"
 
 #: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
-#: calendar/gui/e-week-view.c:3322 mail/folder-browser.c:1444
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
 #: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "�������"
 
 #: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3404 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:945 calendar/gui/e-day-view.c:3479
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-week-view.c:3406 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:947 calendar/gui/e-day-view.c:3454
-#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-week-view.c:3335 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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"
@@ -4179,28 +4344,29 @@ msgstr "�������� ������� ��� �����������"
 msgid "_Delete Selected Tasks"
 msgstr "������� ��������� �������"
 
-#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:6955
-#: calendar/gui/e-week-view.c:3816
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "���������� ��������"
 
 #: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� ��� ���������� ������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4211,106 +4377,471 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-calendar-table.etspec.h:3
+#, fuzzy
+msgid "Alarms"
+msgstr "���������� ���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
+msgid "Complete"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Completion Date"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "Due Date"
+msgstr "����������� ����:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+#, fuzzy
+msgid "End Date"
+msgstr "����"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Priority"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Start Date"
+msgstr "���� ������"
+
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
+msgid "Summary"
+msgstr "����"
+
+#: calendar/gui/e-calendar-table.etspec.h:17
+#, fuzzy
+msgid "Task sort"
+msgstr "������ �������"
+
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "�.�."
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "�.�."
 
-#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3304
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "����� ���������� �������"
 
-#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "������� � ������������ ���"
 
-#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3316
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "������� � ����..."
 
-#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3324
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "������� ��� �������"
 
-#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "������� ��� ��������� ������������"
 
-#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3353
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:524
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:529
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:534
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "����� ���������� ��������:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��������� "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "���������� ���������:"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "����������� ������"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "���� �����"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "��"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "�����������������"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:868
+msgid "Meeting Information"
+msgstr "���������� � �������"
+
+#: calendar/gui/e-itip-control.c:872
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:877
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "����� ���������� ��������:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:883
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "����� ���������� ��������:"
+
+#: calendar/gui/e-itip-control.c:887
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:892
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "����� � ���������"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+#, fuzzy
+msgid "Task Proposal"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:927
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "���� �����"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:933
+#, fuzzy
+msgid "Task Update Request"
+msgstr "���� �����"
+
+#: calendar/gui/e-itip-control.c:937
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "�������� ��������"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "��������� ���������"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL \"��������/�����\":"
+
+#: calendar/gui/e-itip-control.c:977
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "��� ������ ���������."
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL \"��������/�����\":"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "���������� ���������"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "������ ����� ������������� ���������."
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "���������� ��������� ���������: �� ���������� ����������."
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "���� ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "���������� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1316
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�� ������� ������� ��� ���� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "�������� ���������"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "������� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1307 calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1507
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4351,210 +4882,215 @@ msgstr "����-����������"
 msgid "date-start"
 msgstr "����-������"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "������� � ������"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "��������� ���������"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "�������������� ���������"
+
+#: calendar/gui/e-meeting-model.c:97
+#, fuzzy
+msgid "Non-Participants"
+msgstr "�������������� ���������"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "��������������"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "�����������"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "�������������� ���������"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "�����������������"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "� ��������"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-#, fuzzy
-msgid "Chair Persons"
-msgstr "������� � ������"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "��������� ���������"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "�������������� ���������"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-#, fuzzy
-msgid "Non-Participants"
-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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2054 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "��� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "��� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "���������� ������..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "���������� ������ ������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "�������� ��������/�����"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "��� ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "��� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "��������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "��������� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "����� ������ ��������:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� ��������� %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "���������� ��������� ������� � \"%s\""
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
 
-#: calendar/gui/e-week-view.c:3302 calendar/gui/e-week-view.c:3340
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "����� �������..."
 
-#: calendar/gui/gnome-cal.c:1316
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ������� ����� \"%s\""
 
-#: calendar/gui/gnome-cal.c:1327
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
 
-#: calendar/gui/gnome-cal.c:1682
+#: calendar/gui/gnome-cal.c:1865
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�������� ����� \"%s\""
@@ -4615,214 +5151,251 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1-��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2-��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3-��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4-��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5-��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6-��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7-��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8-��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9-��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10-��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11-��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12-��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13-��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14-��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15-��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16-��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17-��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18-��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19-��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20-��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21-��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22-��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23-��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24-��"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25-��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26-��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27-��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28-��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29-��"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30-��"
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31-��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "C�"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "��������� ���� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "��������� ������ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "��������� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "��������� ��� (%Y)"
 
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "�������"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "���������:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "���������:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���� ����������:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"���������: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "��������:"
+
 #: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "���������� ���������"
 
 #: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:607
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "�������� ������"
@@ -4835,11 +5408,11 @@ msgstr "������ ��������"
 msgid "Print Setup"
 msgstr "��������� ��������"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ������� ����� ������� � ����� ������� "
 
-#: calendar/gui/tasks-control-factory.c:76
+#: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
@@ -4847,13 +5420,13 @@ msgstr ""
 "�� ������� ������� ���� ���������. ���������� ��������� ���� ��������� ORBit "
 "� OAF."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -4861,14 +5434,14 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -4877,115 +5450,115 @@ msgstr ""
 "����� ��������� ��� �������� \"%s\" �� ��������������, ��� ��������� �� "
 "����� ��������� ��� �������� �� ����� �������."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "�������"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5010,7 +5583,7 @@ msgstr "���������� �� �������������� ���� ������"
 msgid "Decryption is not supported by this cipher"
 msgstr "����������� �� �������������� ���� ������"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5018,7 +5591,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5026,15 +5599,15 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "������������� �����"
 
@@ -5060,30 +5633,26 @@ msgstr "���� �� ��������� %d"
 msgid "Cannot open message"
 msgstr "���������� ������� ���������"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:721 camel/camel-filter-driver.c:837
-msgid "Complete"
-msgstr "���������"
-
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
@@ -5093,31 +5662,31 @@ msgstr "������ ���������� �������: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���������� ������ �������: %s: %s"
 
-#: camel/camel-folder.c:472
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1041
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "������ ��� ���������� ��������� ������ \"%s\":\n"
 "%s"
 
-#: camel/camel-folder.c:1081
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "������ ��� ���������� ��������� ������ \"%s\":\n"
 "%s"
 
-#: camel/camel-folder.c:1263
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "����������� ��������� � %s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5126,7 +5695,7 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5135,112 +5704,112 @@ msgstr ""
 "������ ��� ���������� ��������� ������ \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(��������� ���) ������� ������������� ����������� ����������"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "���������� ������� �� ����������� ���������: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "������������ ��� � ����-��������, ��������� ������"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "�� ������� ������� �����: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "�� ������� ����������: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ������� ������� ���� ���������� ��� %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "���������� ������� ��� ������� ������������� ���� %s. ���������� ��� ��� "
 "�����."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "�� ������� �������� lock ��������� fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�� ������� �������� lock ��������� flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "�� ������� ��������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "���������� ������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "���������� ������� ��������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "���� ��� ���������� ����� �� ��������� ����� %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�� ������� ������� �����: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�� ������� ����������: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "���� ��������� ����������� �����: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(����������� ������)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "������ ��� ������ ��������� �����: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "������ ���������� ���������� ��������� �����: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������ ����������� ���������� ��������� �����: %s"
@@ -5255,87 +5824,87 @@ msgstr "���������� ������� ���� %s ��������� ����� ��� %s"
 msgid "Please enter your %s passphrase"
 msgstr "���������� ������� ���� %s ��������� �����."
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "���������� ��������� ���������: ������������ ����� �����������."
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "�� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "�� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�� ������� ������� ��������� ����: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "���������� ��������� ���������: ������������ ����� �����������."
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "�� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "���������� ������������ ���������: �� ���ģ� ������"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "�� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "�� ������� ��������� %s: �������� ������� �� �������������� � ���� �������."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "���������� ��������� %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "���������� ��������� %s: ��� ������������������ ���� � ������."
@@ -5355,7 +5924,7 @@ msgid "Connection cancelled"
 msgstr "���������� ��������"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ������� ������������ � %s (���� %d): %s"
@@ -5365,12 +5934,12 @@ msgid "(unknown host)"
 msgstr "(����������� ����)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "�������� ��������"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������ ���������� ����������"
@@ -5483,7 +6052,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "������������� ����� ������������� �� �������."
 
@@ -5502,8 +6071,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "������"
 
@@ -5533,55 +6102,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "���� ���������� ����������� ���������: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" ��������� � ���������� ����� ������������"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" ��������� � ���������� �����"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" ��������� � ���������� ����"
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "�������������: %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������ � ���������� �����: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "���� ������ �����: %s: ���� �� ������"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "���� ������ �����: %s: ������� ����������"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "��������� ����������� ����� ����������� �����"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "��� ������ ����� �� ������� � ������� ������ �����"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "��������� ��� ��������� \"%s\" �� ��������"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5627,17 +6196,17 @@ msgstr "�� ������� ������������ ���������."
 msgid "Failed to verify certificates."
 msgstr "�� ������� ��������� �����������."
 
-#: camel/camel-store.c:219
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5645,7 +6214,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5660,7 +6229,7 @@ msgstr ""
 "\n"
 "�ӣ ����� �������?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5679,37 +6248,37 @@ msgstr ""
 "�������: %s\n"
 "������: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "���������� ���������������� URL \"%s\""
 
-#: camel/camel-vee-folder.c:589
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "��� ��������� %s � %s"
 
-#: camel/camel-vee-folder.c:750
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "��� ������ ���������: %s"
 
-#: camel/camel-vee-store.c:252
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-vee-store.c:287
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-vee-store.c:300
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/camel-vee-store.c:308
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ������� �������� �����: %s: %s"
@@ -5742,52 +6311,52 @@ msgstr "����� IMAP ������� �� �������� ���������� �� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� ����� \"OK\" �� IMAP �������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "���������� ������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "���������� ��������� ���� ��� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "����� ���� ���������� � ������ ������� �� �������."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "������������ �������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "��� ��������� � ��������� ������ �� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
-#: camel/providers/imap/camel-imap-folder.c:1766
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1691
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "������������ ����� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1983
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "���������� ����� ���� ��������� � ������ FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "���������� ������� ������� ���: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "������� ��������� %d"
@@ -5800,7 +6369,7 @@ msgstr "�������� ����� �����"
 msgid "Check for new messages in all folders"
 msgstr "�������� ����� ����� �� ���� ������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "�����"
 
@@ -5837,28 +6406,28 @@ msgstr ""
 "����������� � IMAP ������� ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/imap/camel-imap-store.c:520
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������������ ������������� ��� ������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:530
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "������������� ���� %s �� ��������������"
 
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:595
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5869,98 +6438,100 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:894
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1182
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "�������� �������� � ������� UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "����������� �����"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "��� �������� ��������� ����� � �������� ��������� ������� mbox"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 "��������� ������� �� ���� ����� ���������� � ����� \"��������\" (INBOX) �� "
 "���� �������"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "�������� �������� � ������� UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� qmail"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "����������� ���� Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� qmail"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������� �������� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ����� %s � %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ������� ������� �������� ���� ����� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������� ��������� ���� ����� \"%s\": %s"
@@ -5971,28 +6542,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "���������� ��������� ���� ��� %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�� ������� �������� ��������� � �����: ������� ����������"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "���� �� ��������� %d"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� ��������� ��������: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6001,20 +6572,20 @@ msgstr ""
 "���������� �������� ���������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "��� ������ ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "������������ ���������� ���������"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6023,15 +6594,15 @@ msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "����� \"%s\" �� ����������."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6040,21 +6611,21 @@ msgstr ""
 "�� ������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" �� �������� �������� ���������."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "�� �������� �������� �������"
 
@@ -6071,34 +6642,34 @@ msgstr ""
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "�� ������� ������� �������� ����: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "�� ������� ������� �������� ����: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "�������� ��������"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "���������� ������������ ��������� � ����� mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6107,17 +6678,17 @@ msgstr ""
 "���������� �������� ���������: %s �� ����� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������ ����� ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "���� � ����������� ���������: �������� ���� ���������?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6126,7 +6697,7 @@ msgstr ""
 "���������� ������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6135,14 +6706,14 @@ msgstr ""
 "�� ������� ������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "%s �� �������� ������� ������."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6151,116 +6722,116 @@ msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "����� \"%s\" �� �����. �� �������."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "������������� �����"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "��������� ������ ��������� ����������� ����� ������� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "���������� ������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ������� ������� ��������� �������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "������������ ����� � �����, ���� ����� �������������"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ������ �� ��������� �������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "���� ������ �� ��������� �������� ����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���������� ������� �������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "���������� ������� ��������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "����������� ������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "������� ��������� � ��������"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" �� �������� ���������."
@@ -6270,117 +6841,117 @@ msgstr "\"%s\" �� �������� ���������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ������� ������� �������� ����: %s: %s\n"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� ������������ ��������� � ����� mbox: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "%s �� �������� ������� ������."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "����� \"%s%s\" �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "��������� �������� ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "���������� ������� ��������� �������� ���� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "���������� ������� �������� ����� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "���������� ��������� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "����������, ������� ������ NNTP ��� %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "������ �������� ��� ������������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "���� ��� �������� ����� ������������ �� ������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "������ �������� ��� ������������/������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "��������� %s �� �������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "�� ������� �������� � ������� ������ �����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "������� USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "��� ��������� ��� ������ � �������� ��������� � ������ �������� USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "���������� ������� ������� ��� ������� ��������: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "������� USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6388,73 +6959,73 @@ msgstr ""
 "����������� � NNTP ������� ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "�� ������� ������� ��� ������� ���� .newsrc ��� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "��������� ����� POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "�� ������� ��������� ������� ����� ��������� �� POP �������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "�� ������� ������� �����: ������ ��������� ��� �������."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "�������� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "�� ������� �������� ���������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "�� ������� �������� ��������� � POP ������� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "��� ��������� � uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� ��������� %d �� POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "��������� ��������� �� �������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "������� ����� %s ����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "��� ������ � �������� ����� �� �������� IMAP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6463,7 +7034,7 @@ msgstr ""
 "���������������� ������. ������������ POP �������� �������������� ������ "
 "���� �������."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6473,34 +7044,34 @@ msgstr ""
 "������ �� ��������� APOP. ��� ����� �������� �� ��� ���� ������������� ���� "
 "�� ��������, ������� ����� ������������ ���."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "����������� � POP ������� ����� ������������� � �������������� Kerberos 4 "
 "��� �������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "�� ������� ������������������ �� KPOP �������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "�� ������� ������������ � �������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "�� ������� ������������ � POP ������� �� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s����������, ������� POP3 ������ ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6509,12 +7080,12 @@ msgstr ""
 "�� ������� ������������ � POP �������.\n"
 "������ �������� ����� ������������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(�����������)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6522,7 +7093,7 @@ msgstr ""
 "�� ������� ������������ � POP �������.\n"
 "�� �������������� ������������� �������� �������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6531,197 +7102,197 @@ msgstr ""
 "�� ������� ������������ � POP �������.\n"
 "������ �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "����������� ����� �� ������� IMAP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "��� �������� ����� ��������� ţ ��������� \"Sendmail\" �� ��������� �������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "�� ������� ������� ����� � Sendmail: %s: ����� �� ����������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�� ������� ���������� Sendmail: %s: ����� �� ����������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�� ������� ��������� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail ��������� ������ � �������� %s: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "�� ������� ��������� %s: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail ��������� ������ � ���������� %d: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "���������� ����� ����� \"��\" � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "��� �������� ����� � ������� ����������� � ���������� ��������� ���� �� "
 "��������� SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "�������������� ������, ������� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "�������� ������� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "��������� ������� ��� ����� ������� �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "���������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "������ �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "������ ��������� ����� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "������ �� ��������, �������� ������ ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "����������� �������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "�� ��������� ������������; ����� ���������� � <����-��������>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "����������� �������� � ������ �� ���������: �������� ���� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "����������� �������� �� ���������: �������� ���� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "����������� �������� ��������: ������ ��� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "������������ �� ���������; ���������� ���������� <����-���������>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "����������� �������� �� ���������: ������������ ���������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "����������� �������� �� ���������: �������� ��������� ����� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "������ ����� �����; ��������� ����� <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "���� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "���������� �������� ������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "������� ������ �������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��� ������������ ��������� ������������� ��������� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "��������� ���� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "������������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ������ %s �� ������������ ������������� ��� ������������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6732,127 +7303,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� SMTP ����� ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "���������� ��������� ���������: �� ��������� ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "���������� ��������� ���������: ������������ ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "�������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ������ HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "������������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "������������� ����� ������������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "������ ������ MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� RCPT TO: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "������ ������ RCPT TO: %s: ����� �� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� DATA: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "������ ������ DATA: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "������ ������ DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "������ ������ RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "������ ������ QUIT: %s: �� ��������"
@@ -6984,7 +7555,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "������������ ����"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6993,29 +7564,29 @@ msgstr ""
 "������ ��� ������ ����� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "��������� ���..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "��������������!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "���� ����������, ����������?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���������� �����: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� �������� �����: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7023,17 +7594,17 @@ msgstr ""
 "�� ������� ������� ����� ���������� ��� ����� �ޣ��.\n"
 "������ ������������ ����� ���������� �� ���������?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ���������� �����: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "�� ������� �������� ��������� � POP ������� %s: %s"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7042,7 +7613,7 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7051,7 +7622,7 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7060,7 +7631,7 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7069,7 +7640,7 @@ msgstr ""
 "Evolution ����� �������� ����� Pine.\n"
 "������ ������������� �� � Evolution?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7079,31 +7650,31 @@ msgstr ""
 "\n"
 "�� ������ ��������� ���������?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "����������� ���������"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "������� ����"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "�������� ��������� ����..."
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7112,7 +7683,7 @@ msgstr ""
 "�� ������� ������� ���� ���������, ������ ��� �� ��� �� ���������\n"
 "�� ����� �������� � �������� ����������."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7120,7 +7691,7 @@ msgstr ""
 "�� ������� ������� ���� ���������, ������ ��� �� ��� �� ���������\n"
 "�� ����� �������� � �������� ����������."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "���������� ���������������� �������� ����� Evolution."
 
@@ -7181,23 +7752,23 @@ msgid "Subject does not contain"
 msgstr "�� ��������"
 
 #. Remember the password?
-#: e-util/e-passwords.c:348 mail/mail-session.c:258
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "��������� ���� ������"
 
-#: e-util/e-passwords.c:350 mail/mail-session.c:259
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -7256,30 +7827,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7419,7 +7990,7 @@ msgstr "�����"
 msgid "Add action"
 msgstr "�������� ��������"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7428,16 +7999,16 @@ msgstr ""
 "��-��... �� ������ ������� �����.\n"
 "����������, ��������� � ������� ���������� ����� ��� �������� �����."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "������� �����"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "������ URI �����"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<�������� ����� ��� ������ �����>"
 
@@ -7454,39 +8025,39 @@ msgstr ""
 msgid "Test"
 msgstr "��������"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "�������� �������: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "���������������"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "����"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "���� ������������� ���� ���������"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "���� ������������� ������ �� ���������"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "�������� ��������"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "��������"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "���������"
 
@@ -7676,10 +8247,11 @@ msgid "Replied to"
 msgstr "��������"
 
 #: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "�����������"
 
@@ -7708,15 +8280,12 @@ msgstr "������������� ���������"
 msgid "starts with"
 msgstr "���������� �"
 
-#: filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "���������"
-
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
 
@@ -7728,15 +8297,15 @@ msgstr "���� �����"
 msgid "was before"
 msgstr "���� ��"
 
-#: filter/rule-editor.c:161
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:257
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "�������� �������"
 
-#: filter/rule-editor.c:322
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "������ �������"
 
@@ -7744,48 +8313,48 @@ msgstr "������ �������"
 msgid "Score Rules"
 msgstr "������� ��������"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "��� ���� ������� ���� �� ���� ����� � �������� ���������."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "��������� Evolution ��� ��������� �����."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "��������������"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "������������� ��"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "�������������� %s.\n"
 "������ %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "�������� \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "�����"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7793,20 +8362,15 @@ msgstr ""
 "Evolution ����� �������� ����� Elm.\n"
 "������ ������������� �� � Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "��������: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "�������� �����"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7814,23 +8378,23 @@ msgstr ""
 "Evolution ����� ����� GnomeCard.\n"
 "������ ������������� �� � Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7838,11 +8402,11 @@ msgstr ""
 "Evolution ����� �������� ����� Netscape.\n"
 "������ ������������� �� � Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7850,7 +8414,7 @@ msgstr ""
 "Evolution ����� �������� ����� Pine.\n"
 "������ ������������� �� � Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "������"
@@ -7888,73 +8452,73 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "����.����� �� ������ ��������"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "����������� �����"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "����������� �����"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "�� ������� ������������ � �������: %s"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "��� ����� �� ����� ��������� ���������."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "�������� �������� ���� �����"
 
-#: mail/component-factory.c:751
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "�������� ���������"
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "�������� ���������"
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "���������� ���������������� �������� ��������� \"��������\"."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "���������� ���������������� �������� ��������� \"��������\"."
 
-#: mail/component-factory.c:958
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "���������� ���������������� �������� ��������� \"��������\"."
 
-#: mail/component-factory.c:1157
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
@@ -7967,165 +8531,165 @@ msgstr "�������� ��� \"%s\""
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "������� %d"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "���������"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "�������������� %d"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "�������������� %d"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "������� ����.����� �� ������"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "����.����� �� ����"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "����.����� �� �����������"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "����.����� �� ����������"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "����.����� �� ������ ��������"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "������ ���������..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "��������� ���..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "������"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "�������� � ������"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "�������� ��� ������������"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "�������� ��� ������"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "�������� ��� ��������"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "������������"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "�������� ����������� � �������� �����"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "����.����� �� ������ ��������"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "����.����� �� ������ �������� (%s)"
@@ -8233,7 +8797,7 @@ msgstr ""
 "\n"
 "�� ������ ��������� ���������?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8271,27 +8835,27 @@ msgstr "�� ������� ��� ������ ������� ���� ����� ����?"
 msgid "Mail Settings"
 msgstr "��������� �����..."
 
-#: mail/mail-autofilter.c:69
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "����� ��� %s"
 
-#: mail/mail-autofilter.c:212
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "���� -- %s"
 
-#: mail/mail-autofilter.c:228
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "����� �� %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ������ ��������"
 
-#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "�������� ������� �������"
 
@@ -8386,20 +8950,20 @@ msgstr "����������� ������"
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "����������� ��������� �"
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "����������� ��������� �"
 
-#: mail/mail-callbacks.c:1701
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� ������� ��� �� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:1726
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8407,7 +8971,7 @@ msgstr ""
 "�� ������ ������� ������ ���������\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:1765
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8415,28 +8979,28 @@ msgstr ""
 "�� ������ ������ ����������� ���������\n"
 "�� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:1779
+#: mail/mail-callbacks.c:1810
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� ������� ��� �� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "��������� �� �������"
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:1901
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������������"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8444,12 +9008,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2084
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� ���������� �����"
 
-#: mail/mail-callbacks.c:2192
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8458,19 +9022,19 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2204
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "�������"
 
-#: mail/mail-callbacks.c:2267
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "������ ���������"
 
-#: mail/mail-callbacks.c:2313
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
@@ -8530,11 +9094,16 @@ msgstr ""
 "�����������."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "�������� �� ������ Evolution"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "����"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8543,6 +9112,14 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "��������"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
@@ -8592,7 +9169,7 @@ msgstr ""
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������"
 
@@ -8659,7 +9236,7 @@ msgstr "����������"
 msgid "Done"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "���������"
 
@@ -8808,7 +9385,8 @@ msgstr "�������� ��.�����"
 msgid "Sending Mail"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "������������"
 
@@ -8859,11 +9437,6 @@ msgstr "����������� �����"
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:85
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "���"
-
 #: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Use s_ecure connection (SSL)"
@@ -9080,23 +9653,23 @@ msgstr "������"
 msgid "External Viewer"
 msgstr "������� ��������� ���������"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�������� ����������� ���������"
 
-#: mail/mail-display.c:1615
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:1617
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "����������� ������"
 
-#: mail/mail-display.c:1620
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "��������� ������ ���"
 
-#: mail/mail-display.c:1623
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "��������� ����������� ���..."
 
@@ -9113,31 +9686,53 @@ msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "������������ ��.�����"
 
-#: mail/mail-format.c:904
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "��������"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "�����"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "���.�����:"
 
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"��� ��������� � �������� ��������, ������� ������ �������� ������������."
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"��� ��������� � �������� ��������, ������� ������ �������� ������������."
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"��� ��������� � �������� ��������, ������� �� ����� ���� ��������� �� "
+"������������."
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9167,57 +9762,57 @@ msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���������� �����"
 
-#: mail/mail-local.c:701
+#: mail/mail-local.c:707
 #, 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:754
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: mail/mail-local.c:800
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1213
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "��������� ����� \"%s\" � ������ \"%s\""
 
-#: mail/mail-local.c:1228
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1250
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� �� ������ ����������� ��������� �� ���� ����� ��� ������."
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� %s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9226,7 +9821,7 @@ msgstr ""
 "������ ��� \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9235,123 +9830,121 @@ msgstr ""
 "������ ��� ���������� ��������:\n"
 "%s"
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "���������"
 
-#: mail/mail-ops.c:85
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "�������� \"%s\""
 
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d �� %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "���������."
 
-#: mail/mail-ops.c:790
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "���������� ��������� � �����"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:892
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"���������� ����������� ����� �\n"
-"\"%s\"."
-
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "�����������"
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "���������� ����� � \"%s\""
 
-#: mail/mail-ops.c:1195
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+msgid "Trash"
+msgstr "�������� �������"
+
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "����������� ���������"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1310
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "�������� ��������� %s"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "������������ �����"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� ���������"
 
-#: mail/mail-ops.c:1762
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "���������� %d ���������"
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9360,7 +9953,7 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9369,11 +9962,11 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "���������� ��������"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9382,17 +9975,17 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "���������� �������� ������: %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2093
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "����������� � �������..."
@@ -9501,17 +10094,17 @@ msgstr "����������� ���������"
 msgid "Forwarded Message"
 msgstr "����������� ���������"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� ����� � \"%s\""
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9520,17 +10113,21 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:723
+msgid "VFolders"
+msgstr "����.�����"
+
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "������ ����.�����"
 
-#: mail/mail-vfolder.c:799
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:853
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "����� ����.�����"
 
@@ -9599,10 +10196,24 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "�������� ������ ���������"
 
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "���� ���������"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "������:"
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -9623,16 +10234,17 @@ msgstr "������������ �� ����� \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "����������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1278
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "��������� �� �������"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 #, fuzzy
 msgid "Please select a server."
 msgstr "������� ������"
@@ -9679,151 +10291,138 @@ msgstr "����������"
 msgid "Evolution component for the executive summary."
 msgstr "��������� Evolution ��� Executive Summary."
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460
-msgid "Summary"
-msgstr "����"
-
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "���������� ���������������� �������� ��������� \"��������\"."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "�������"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "���� �����"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "���:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "���� ��������"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
-#: my-evolution/e-summary-rdf.c:416
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>������ ��� �������� ���������</b>"
 
-#: my-evolution/e-summary-rdf.c:529
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "����� �����"
 
-#: my-evolution/e-summary-tasks.c:247
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "�������� �������"
 
-#: my-evolution/e-summary-tasks.c:286
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "��������:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:560
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "������"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:662
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:723
+#: my-evolution/e-summary-weather.c:722
 #, fuzzy
 msgid "Regions"
 msgstr "�������:"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "������"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "���� ������ ���������"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
 #: my-evolution/metar.c:29
-msgid " F"
+msgid "�F"
 msgstr ""
 
 #: my-evolution/metar.c:29
-msgid " C"
+msgid "�C"
 msgstr ""
 
 #: my-evolution/metar.c:33
@@ -11148,18 +11747,6 @@ msgstr "����������"
 msgid "_Weather"
 msgstr "������"
 
-#: my-evolution/my-evolution.glade.h:33
-msgid "label27"
-msgstr "�����26"
-
-#: my-evolution/my-evolution.glade.h:34
-msgid "label39"
-msgstr "�����26"
-
-#: my-evolution/my-evolution.glade.h:35
-msgid "label40"
-msgstr "�����26"
-
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "�������� Evolution."
@@ -11172,6 +11759,20 @@ msgstr "�������� �����������"
 msgid "Cancel Operation"
 msgstr "�������� ��������"
 
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "��������"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "����������� �����"
+
 #: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "��������� Evolution"
@@ -11475,7 +12076,7 @@ msgstr "������ ������ � ��������� �� ������ ��������"
 msgid "Import a single file"
 msgstr "������ ������ �����"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11483,11 +12084,11 @@ msgstr ""
 "���������� ���������...\n"
 "������������ ������������ ���������"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "������ ����������������� �����ԣ��"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
@@ -11500,7 +12101,7 @@ msgstr "������� �����"
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "�������������"
 
@@ -11520,12 +12121,31 @@ msgstr "���������� ���������������� �������� Evolution: %s"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "���������� ���������������� �������� Evolution: %s"
 
-#: shell/e-shell-startup-wizard.c:744
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "�� ������� ��� �����."
+
+#: shell/e-shell-utils.c:121
+#, fuzzy
+msgid "Folder name cannot contain the Return character."
+msgstr "���������� ������� ������� ���: %s"
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "��� ����� �� ����� ��������� ���������."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy �� ��� ������ � ����� $PATH."
@@ -11575,34 +12195,34 @@ msgstr "�������� ��� ����"
 msgid "Work Offline"
 msgstr "�������� ��� ����"
 
-#: shell/e-shell-view.c:213
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(����� �� ��������)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1589
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(���)"
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1643
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1649
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:653
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "���������� ���������� ��������� ��������� -- %s"
@@ -11615,10 +12235,6 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "��"
-
 #: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "������������ ���������"
@@ -11759,10 +12375,6 @@ msgstr "������ ���������� ��������."
 msgid "Shortcuts"
 msgstr "��������"
 
-#: shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "��������"
-
 #: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
@@ -11838,64 +12450,64 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ���������)"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "��������"
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "������������ ��������"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "��� ����� ���������"
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "��� ���������"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "�� �������"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "���������������� ���"
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "���������������� �����"
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "���������������� ��������"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "���������� ������"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 #, fuzzy
 msgid "Invalid URI"
 msgstr "URI ���������"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "����� ��������� �����"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "��� �����"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr ""
 
@@ -12023,19 +12635,19 @@ msgstr ""
 "���� �������� �������� ��� ����� ������� �������\n"
 "������� ������ � Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "�����ԣ��"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "�� �������������"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "�� ���������� �����"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ����� ��������� ��������� ������:"
@@ -12045,66 +12657,24 @@ msgstr "Evolution ����� ��������� ��������� ������:"
 msgid "Evolution is now exiting ..."
 msgstr "��������� �����..."
 
-#: shell/main.c:193
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"������! �������, ��� ����� ����� ������� ��� ��������������� ������\n"
-"������ ��������� ���������� \"Evolution\".\n"
-"\n"
-"Evolution ��� �� ���������. ��������� �������� ����� ��������, �� � "
-"���������\n"
-"������� �� ��������� ��� ������ ����������. ���� �� �� ������ ������ ���\n"
-"������� ���-������, �������� ��� ������, ��� ��� ���������� =)\n"
-"\n"
-"�� ��������, ��� Evolution �������� �������� ��� ���, �� ��� ��� ������\n"
-"������������� ��� � ���, ��� Evolution �����: ������, ����������\n"
-"���� �����, ��������� ����������� ������������� ��������, ��������� 100%\n"
-"���, ��������, ���������� HTML-����� � ��������� ������ �������� � �������\n"
-"��� � �������� ��������� ����� �������� � ���������. ����������� �� ����\n"
-"����� � ����.\n"
-"\n"
-"�� ��������, ��� ��� ���������� ���������� ����� ������� ������ � ��\n"
-"������������ �� ���� �������!\n"
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"� ��������������\n"
-"������� Evolution\n"
-
-#: shell/main.c:268
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ������� � �������� Ximian Evolution."
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "���������� ���������������� �������� Evolution: %s"
 
-#: shell/main.c:347
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "��������� ��������"
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "���������� ���������� ����� ���� ����������� � ����."
 
-#: shell/main.c:390
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ������� ���������������� ������������ ������� Bonobo."
 
@@ -12410,11 +12980,12 @@ msgstr "������..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "���������"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "��������� � �������"
 
@@ -12430,7 +13001,7 @@ msgstr "��������� ���� ������� �� �����"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "����"
@@ -12452,7 +13023,7 @@ msgstr "��������� ������� � ������� ���� �������"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "���������"
 
@@ -12519,10 +13090,6 @@ msgstr "�������� ������� � ����������"
 msgid "Customise My Evolution"
 msgstr "%s - Evolution %s"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "������"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13099,7 +13666,7 @@ msgstr "������� ��� ����"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�������"
@@ -13130,7 +13697,8 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "������"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -13182,7 +13750,7 @@ msgid "Save in folder..."
 msgstr "��������� � �����..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "��������� ������� ����"
 
@@ -13276,7 +13844,7 @@ msgid "_From Field"
 msgstr "���� \"��\""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "��������"
 
@@ -13292,7 +13860,7 @@ msgstr "���� \"�����\""
 msgid "_Security"
 msgstr "������������"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "�������"
 
@@ -13619,114 +14187,114 @@ msgstr "���������� ���� ���������"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "�������"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "������"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "�������"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "����� ������ ���� � �������: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�������� �������� ������ ���� ����� 0 � 100, ������������"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "����������"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "���������������������"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "������������������"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "������������"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "����ݣ����"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "����������"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "�����"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "����������� ����� ��������: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "������� ������������ ����� ��������"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "������..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "��������� ��������"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "�������� ������"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "��������� ���������� ������"
 
@@ -13764,11 +14332,11 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� ���������� ��� ��������� �����."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "�����"
 
@@ -13782,27 +14350,104 @@ msgstr "������ ������������ �������� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "������������ ����������� ������; ������� ���������"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ������� ���������������� GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ������� ���������������� GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
-#~ msgid "Other Contacts"
-#~ msgstr "������ ��������"
+#~ msgid "label18"
+#~ msgstr "�����26"
+
+#~ msgid "label19"
+#~ msgstr "�����26"
+
+#~ msgid "label20"
+#~ msgstr "�����26"
+
+#~ msgid "label47"
+#~ msgstr "�����26"
+
+#~ msgid "label26"
+#~ msgstr "�����26"
+
+#~ msgid "label55"
+#~ msgstr "�����26"
+
+#~ msgid "_Invite Others"
+#~ msgstr "���������� ������"
+
+#~ msgid "label21"
+#~ msgstr "�����26"
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "��������: "
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "���������� ����������� ����� �\n"
+#~ "\"%s\"."
 
+#~ msgid "label27"
+#~ msgstr "�����26"
+
+#~ msgid "label39"
+#~ msgstr "�����26"
+
+#~ msgid "label40"
+#~ msgstr "�����26"
+
+#, fuzzy
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
 #~ msgstr ""
-#~ "�� �������, � ��� ��� ������\n"
-#~ "������� ���� �������?"
+#~ "������! �������, ��� ����� ����� ������� ��� ��������������� ������\n"
+#~ "������ ��������� ���������� \"Evolution\".\n"
+#~ "\n"
+#~ "Evolution ��� �� ���������. ��������� �������� ����� ��������, �� � "
+#~ "���������\n"
+#~ "������� �� ��������� ��� ������ ����������. ���� �� �� ������ ������ ���\n"
+#~ "������� ���-������, �������� ��� ������, ��� ��� ���������� =)\n"
+#~ "\n"
+#~ "�� ��������, ��� Evolution �������� �������� ��� ���, �� ��� ��� ������\n"
+#~ "������������� ��� � ���, ��� Evolution �����: ������, ����������\n"
+#~ "���� �����, ��������� ����������� ������������� ��������, ��������� 100%\n"
+#~ "���, ��������, ���������� HTML-����� � ��������� ������ �������� � "
+#~ "�������\n"
+#~ "��� � �������� ��������� ����� �������� � ���������. ����������� �� ����\n"
+#~ "����� � ����.\n"
+#~ "\n"
+#~ "�� ��������, ��� ��� ���������� ���������� ����� ������� ������ � ��\n"
+#~ "������������ �� ���� �������!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "� ��������������\n"
+#~ "������� Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "������"
 
 #, fuzzy
 #~ msgid "Notification about your appointment starting on %s and ending on %s"
@@ -13843,174 +14488,12 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "%s at an unknown time"
 #~ msgstr "����������� ������"
 
-#, fuzzy
-#~ msgid "Attendee"
-#~ msgstr "��� �������������"
-
-#, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "* �������� ����� ��� ���������� �������� *"
-
-#, fuzzy
-#~ msgid "Common Name"
-#~ msgstr "�������� �ޣ��"
-
-#, fuzzy
-#~ msgid "Delegated From"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "Delegated To"
-#~ msgstr "���������"
-
-#~ msgid "Language"
-#~ msgstr "����"
-
-#~ msgid "Member"
-#~ msgstr "����"
-
-#~ msgid "Role"
-#~ msgstr "����"
-
 #~ msgid "_Confidential"
 #~ msgstr "����������������"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#, fuzzy
-#~ msgid "Completion Date"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "Due Date"
-#~ msgstr "����������� ����:"
-
-#, fuzzy
-#~ msgid "End Date"
-#~ msgstr "����"
-
-#~ msgid "Priority"
-#~ msgstr "���������"
-
-#~ msgid "Start Date"
-#~ msgstr "���� ������"
-
-#, fuzzy
-#~ msgid "Task sort"
-#~ msgstr "������ �������"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "����������� ����������"
-
 #~ msgid "<b>Description:</b> %s"
 #~ msgstr "<b>��������:</b> %s"
 
-#~ msgid "Meeting Information"
-#~ msgstr "���������� � �������"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "����� ���������� ��������:"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "��� ������ ���������."
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "���������"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "������� ��������"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "����� � ���������"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "����������"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "���� �����"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "��� ������ ���������."
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "��������"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "�������� ��������"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "��������� ���������"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "����������� ����������"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "����������� ����������"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "��� ������ ���������."
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "���������� ���������"
-
-#, fuzzy
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "������ ����� ������������� ���������."
-
 #~ msgid "Qmail maildir-format mail files"
 #~ msgstr "�������� ����� � ������� �������� ��������� qmail"
 
@@ -14028,14 +14511,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Could not create composer window."
 #~ msgstr "���������� ������� ���� ���������."
 
-#, fuzzy
-#~ msgid "Account %d"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "%s: Inbox"
-#~ msgstr "��������"
-
 #~ msgid "No GPG/PGP program configured."
 #~ msgstr "��������� GPG/PGP �� ���������."
 
@@ -14048,30 +14523,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Click icon to decrypt."
 #~ msgstr "�������� �� ����������� ��� ����������."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "��� ��������� � �������� ��������, ������� ������ �������� ������������."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "��� ��������� � �������� ��������, ������� �� ����� ���� ��������� �� "
-#~ "������������."
-
-#~ msgid "Trash"
-#~ msgstr "�������� �������"
-
-#~ msgid "VFolders"
-#~ msgstr "����.�����"
-
-#, fuzzy
-#~ msgid "Received"
-#~ msgstr "���� ���������"
-
-#, fuzzy
-#~ msgid "Size"
-#~ msgstr "������:"
-
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr ""
 #~ "���������� ���������������� ��������� Executive Summary ��������� "
@@ -14089,18 +14540,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgstr "������"
 
 #, fuzzy
-#~ msgid "Outbox"
-#~ msgstr "mbox"
-
-#, fuzzy
-#~ msgid "Local Folders"
-#~ msgstr "����������� �����"
-
-#, fuzzy
-#~ msgid "Folder cannot contain the directory separator."
-#~ msgstr "���������� ������� ������� ���: %s"
-
-#, fuzzy
 #~ msgid "Ximian Evolution"
 #~ msgstr "Evolution"
 
@@ -14146,9 +14585,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ "��-��! ���� ��� \"%s\" ���������� ������. :-(\n"
 #~ "�������� ��� ��������, ��� ��������� %s ������."
 
-#~ msgid "_Calendar Information:"
-#~ msgstr "���������� ���������:"
-
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
 #~ "��������� ������ ���� \"�������\", \"����������\", \"������\" ��� "
@@ -14348,10 +14784,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %m/%d/%Y"
 
-#, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
 #~ msgid "Elm mail"
 #~ msgstr "����� Elm"
 
diff --git a/po/sk.po b/po/sk.po
index 5da002058f..18171f6380 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16\n"
-"POT-Creation-Date: 2001-10-25 08:06-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-24 13:53CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Vytv�racie rozhranie pre import s�borov VCard do Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importuje s�bory VCard do Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Vytv�racie rozhranie pre import s�borov VCard do Evolution."
@@ -21,291 +31,296 @@ msgstr "Vytv�racie rozhranie pre import s�borov VCard do Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importuje s�bory VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Ulo�i� ako"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Meno"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prim�rny"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Prim"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Zamestnanie"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Zam"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Sp�tn� volanie"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organiz�cia"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Pracovn� fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Prac. fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Dom�ci fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Zamestnanie 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Zam 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "In�"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "�al�� fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "WWW str�nka"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Oddelenie"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Odd"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Prac."
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Povolanie"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Pov."
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Ved�ci"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Ved."
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asist."
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Prez�vka"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Prez."
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Man�el(ka)"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Pozn�mka"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI kalend�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Vo�no/zanepr�zdnen� URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "Url v/z"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "V�ro�ie"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "V�r."
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "D�tum narodenia"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kateg�rie"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Priezvisko"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +328,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,7 +336,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -329,7 +344,7 @@ msgstr ""
 "\n"
 "  Krstn�:      "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 "  �al�ie: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "  Pr�pona:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "D�tum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -377,7 +392,7 @@ msgstr ""
 "\n"
 "Po�tov� schr�nka:"
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -385,7 +400,7 @@ msgstr ""
 "\n"
 "  Pr�p:         "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -393,7 +408,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -401,7 +416,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -409,7 +424,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -417,7 +432,7 @@ msgstr ""
 "\n"
 "   PS�:  "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -425,7 +440,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -433,7 +448,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -441,7 +456,7 @@ msgstr ""
 "\n"
 "Telef�ny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -449,7 +464,7 @@ msgstr ""
 "\n"
 " Telef�n: "
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -457,7 +472,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -465,7 +480,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -473,7 +488,7 @@ msgstr ""
 "\n"
 "Po�t.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -481,7 +496,7 @@ msgstr ""
 "\n"
 "�asov� z�na:"
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -489,7 +504,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -497,7 +512,7 @@ msgstr ""
 "\n"
 "Poz�cia: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -505,7 +520,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -513,7 +528,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -521,7 +536,7 @@ msgstr ""
 "\n"
 "  Vlastn�:"
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -529,7 +544,7 @@ msgstr ""
 "\n"
 "  Vlastn�2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -537,7 +552,7 @@ msgstr ""
 "\n"
 "  Vlastn�3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -545,7 +560,7 @@ msgstr ""
 "\n"
 "  Vlastn�4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -553,7 +568,7 @@ msgstr ""
 "\n"
 "Kateg�rie: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -571,7 +586,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -579,7 +594,7 @@ msgstr ""
 "\n"
 "Unik�tny re�azec:"
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -587,11 +602,11 @@ msgstr ""
 "\n"
 "Verejn� k���:"
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -600,16 +615,18 @@ msgstr "VKartapre %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:1433
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1091
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nie je mo�n� inicializova� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "H�ad�m...."
 
@@ -622,60 +639,60 @@ msgstr "Na��tavam..."
 msgid "Error in search expression."
 msgstr "Chyba v h�adanom v�raze."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Prip�jam sa na server LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Nepodarilo sa pripoji� k serveru LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "�ak�m na spojenie so serverom LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Prid�vam kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Odstra�ujem kartu zo serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Upravujem kartu na serveri LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Prij�mam v�sledky h�adania LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Sp���am h�adanie znovu."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Kurzor nie je mo�n� na��ta�\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook nena��tan�\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:662
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Nie je mo�n� spusti� server wombat"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:663
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Nie je mo�n� spusti� wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie Adresa z pilota"
 
@@ -719,39 +736,39 @@ msgstr "Vytv�racie rozhranie pre rozhranie adresu z Adres�ra."
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Adres�r"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Prie�inok obsahuj�ci inform�cie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahuj�ci inform�cie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nov� kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Nov� _kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Nov� zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Nov� _zoznam kontaktov"
 
@@ -784,7 +801,7 @@ msgid "Base"
 msgstr "S�stava"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Z�kladn�"
 
@@ -878,7 +895,7 @@ msgstr "_Prida�"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Upravi�"
@@ -896,19 +913,19 @@ msgid "_Server name:"
 msgstr "_Meno serveru:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie je mo�n� inicializova� gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "In� kontakty"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nie je mo�n� otvori� adres�r"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -917,7 +934,7 @@ msgstr ""
 "Nebolo mo�n� otvori� tento adres�r. To bu� znamen�, �e ste\n"
 "zadali neplatn� URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -928,7 +945,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution pou��va�, mus�te ho prekompilova�\n"
 "z CVS po z�skan� OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -936,42 +953,42 @@ msgstr ""
 "Nebolo mo�n� otvori� tento adres�r. Pros�m, overte, �e cesta\n"
 "existuje a �e m�te dostato�n� pr�va."
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (pou��vate� %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "�ubovo�n� pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Meno obsahuje"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-mail obsahuje"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kateg�ria je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:98
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
 #: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Pokro�il�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "�ubovo�n� kateg�ria"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktor� zobraz� prehliada� prie�inku"
 
@@ -984,51 +1001,51 @@ msgstr "URI, ktor� zobraz� prehliada� prie�inku"
 msgid "(none)"
 msgstr "(ni�)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Prim�rny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Vyberte akciu"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Vytvori� nov� kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Prida� adresu do existuj�ceho kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Ot�zka pre adres�r..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Upravi� kontakt"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Prida� do kontaktov"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Zlia� e-mailov� adresu"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Zak�za� ot�zky"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Povoli� ot�zky (nebezpe�n�)"
 
@@ -1040,35 +1057,35 @@ msgstr "Rozhranie pre v�ber mena adres�ra Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstr�ni�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Odstr�ni� v�etky"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Posla� po�tu HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Upravi� zoznam kontaktov"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Zoznam kontaktov bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nezobrazen�ch)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
@@ -1086,7 +1103,15 @@ msgstr ""
 "a vyrie�ili tento probl�m, po�lite e-mail Jonovi Trowbridgeovi <trow@ximian\n"
 "com> s detailn�m popisom okolnost�, pri ktor�ch sa chyba objavila. �akujeme."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adres�ra"
 
@@ -1146,12 +1171,12 @@ msgstr "Spolupr�ca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detaily"
 
@@ -1220,8 +1245,8 @@ msgstr "_Kontakty..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1289,46 +1314,46 @@ msgstr "Naozaj chcete odstr�ni� tento kontakt?"
 msgid "Delete Contact?"
 msgstr "Odstr�ni� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patr� do t�chto kateg�ri�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie je mo�n� n�js� prvok pre pole: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "R�chly kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Upravi� cel�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Cel� meno"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2395,7 +2420,7 @@ msgid "contact-list-editor"
 msgstr "editor-zoznamu-kontaktov"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
@@ -2444,13 +2469,13 @@ msgstr ""
 "Zmenen� e-mail alebo meno pre tento kontakt u� v tomto\n"
 "prie�inku existuje. Chcete ho aj tak prida�?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Pokro�il� h�adanie"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "H�ada�"
 
@@ -2469,9 +2494,9 @@ msgstr "%d kariet"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ulo�i� ako VCard"
@@ -2482,18 +2507,18 @@ msgid "Open"
 msgstr "Otvori�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Preda� �alej kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Posla� spr�vu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2501,94 +2526,99 @@ msgid "Print"
 msgstr "Tla�i�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Tla�i� ob�lku"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Odstr�ni�"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�spech"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1889
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Nezn�ma chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Pr�stup zamietnut�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Karta nen�jden�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "ID karty u� existuje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovan�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:484 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Zru�en�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "In� chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Chcete ulo�i� zmeny?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Chyba pri prid�van� zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Chyba pri prid�van� karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Chyba pri odstra�ovan� zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Chyba pri odstra�ovan� karty"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2596,84 +2626,84 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Kliknut�m prid�te kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Prim�rny telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Asistentov telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Telef�n do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Sp�tn� volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Firemn� felef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telef�n domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Adresa zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telef�n v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Telef�n do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telef�n domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "In� telef�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "In� adresa"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "a %d in�ch kariet."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "a jedna in� karta."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Ulo�i� do adres�ra"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2859,58 +2889,63 @@ msgstr "��rka:"
 msgid "_Font..."
 msgstr "_P�smo..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Tla�i� karty"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Tla�i� kartu"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Tla�i� ob�lku"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Upravi� sch�dzku"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Vysok�"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Norm�lny"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:410 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "N�zka"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Nedefinovan�"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:617
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Chyba pri komunik�cii s kalend�rov�m serverom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:725
-#: calendar/conduits/todo/todo-conduit.c:728
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie ToDo pilota"
 
@@ -2966,23 +3001,23 @@ msgstr "Slu�ba upozor�ovania na poplachy"
 msgid "Factory for the alarm notification service"
 msgstr "Vytv�racie rozhranie pre slu�bu na upozornenie na poplach"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:217
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Starting:"
 msgstr "Od:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:219
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
 msgid "Ending:"
 msgstr "Do:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "neplatn� �as"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 msgid "Evolution Alarm"
 msgstr "Upozor�ovanie Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "Upozornenie na %s"
@@ -3004,11 +3039,11 @@ msgstr "�as opakovania (min�ty)"
 msgid "_Edit appointment"
 msgstr "_Upravi� sch�dzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Popis nie je k dispoz�cii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3019,7 +3054,7 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastaven�.\n"
 "Evolution preto zobraz� norm�lny dial�g."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3036,114 +3071,115 @@ msgstr ""
 "\n"
 "Chcete tento program spusti�?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nie je mo�n� inicializova� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Nie je mo�n� vytvori� slu�bu upozor�ovania"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie je mo�n� vytvori� vytv�racie rozhranie pre slu�bu upozor�ovania"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je mo�n� vytvori� kalend�rov� poh�ad. Pros�m, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "S�kromn�"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Tajn�"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Verejn�"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:460
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Vo�n�"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:461
-#: calendar/gui/e-meeting-time-sel.c:410 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Zanepr�zdnen�"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Neza�al"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:482
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:483 calendar/gui/e-meeting-model.c:316
-#: calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Dokon�en�"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3154,54 +3190,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "�iadna"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Priraden�"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "�no"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:300
-#: calendar/gui/e-meeting-model.c:721
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nie"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "H�ad�m"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "De�"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Pracovn� t��de�"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "T��de�"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Mesiac"
 
@@ -3221,44 +3257,44 @@ msgstr "Koment�r obsahuje"
 msgid "Unmatched"
 msgstr "Nen�jden�"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalend�r"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Prie�inok obsahuj�ci sch�dzky a udalosti"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:241 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�lohy"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Prie�inok obsahuj�ci �lohy to-do"
 
-#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Vytvori� nov� sch�dzku"
 
-#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nov� _sch�dzka"
 
-#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Vytvor� nov� �lohu"
 
-#: calendar/gui/component-factory.c:650
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "Nov� �_loha"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ktor� bude kalend�r zobrazova�"
 
@@ -3330,110 +3366,110 @@ msgstr "hod�n"
 msgid "minutes"
 msgstr "min�t"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dn�"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 de�"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d t��d�ov"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 t��de�"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d hod�n"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d min�t"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 min�ta"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sek�nd"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Prehra� zvuk"
 
-#: calendar/gui/dialogs/alarm-page.c:378
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Zobrazi� spr�vu"
 
-#: calendar/gui/dialogs/alarm-page.c:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Posla� e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Spusti� program"
 
-#: calendar/gui/dialogs/alarm-page.c:392
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "M� sa vykona� nezn�ma akcia"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred za�iatkom sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:407
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po za�iatku sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na za�iatku sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncom sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:424
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po konci sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:429
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci sch�dzky"
 
-#: calendar/gui/dialogs/alarm-page.c:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pre nezn�my typ spustenia"
@@ -3454,7 +3490,7 @@ msgstr "Pripomenutia"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:683 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "S�hrn:"
 
@@ -3537,7 +3573,7 @@ msgid "First day of wee_k:"
 msgstr "_Prv� de� t��d�a:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Piatok"
 
@@ -3550,7 +3586,7 @@ msgid "Minutes"
 msgstr "Min�ty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -3559,7 +3595,7 @@ msgid "O_verdue tasks:"
 msgstr "�lohy _po term�ne:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -3580,7 +3616,7 @@ msgid "Su_n"
 msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Nede�a"
 
@@ -3597,7 +3633,7 @@ msgid "Tas_ks due today:"
 msgstr "�lohy s _dne�n�m term�nom:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "�tvrtok"
 
@@ -3618,12 +3654,12 @@ msgid "Time format:"
 msgstr "Form�t �asu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Utorok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -3692,115 +3728,120 @@ msgstr "_Str"
 msgid "before the start of the appointment"
 msgstr "pred za�iatkom sch�dzky"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Stav stretnutia sa zmenil. Chcete posla� aktualizovan� verziu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Naozaj chcete zru�i� a odstr�ni� toto stretnutie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Naozaj chcete zru�i� a odstr�ni� t�to �lohu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Naozaj chcete zru�i� a odstr�ni� t�to polo�ku denn�ka?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "T�to udalos� bola odstr�nen�."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "T�to �loha bola odstr�nen�."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "T�to polo�ka denn�ka bola odstr�nen�."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodi� ich a zatvori� editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Neurobili ste �iadne zmeny, zatvori� editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "T�to udalos� bola zmenen�."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "T�to �loha bola zmenen�."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "T�to polo�ka denn�ka bola zmenen�."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodi� ich a aktualizova� editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste �iadne zmeny. Aktualizova� editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr "u do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Dokon�en� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Dokon�en� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Term�n do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Term�n do "
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Nepodarilo sa korektne aktualizova� s�bory"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Upravi� sch�dzku"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sch�dzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "�loha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Polo�ka denn�ka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "�iadny s�hrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Prep�sa� s�bor?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3809,53 +3850,53 @@ msgstr ""
 "S�bor s t�mto menom u� existuje\n"
 "Prep�sa� ho?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Ulo�i� ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa z�ska� aktu�lnu verziu!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Naozaj chcete odstr�ni� sch�dzku `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Naozaj chcete odstr�ni� t�to sch�dzku bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Naozaj chcete odstr�ni� �lohu `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Naozaj chcete odstr�ni� �lohu bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Naozaj chcete odstr�ni� polo�ku denn�ka bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Naozaj chcete odstr�ni� %d sch�dzok?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Naozaj chcete odstr�ni� %d �loh?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Naozaj chcete odstr�ni� %d polo�iek denn�ka?"
@@ -3872,25 +3913,25 @@ msgstr "Delegova� na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegova�"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Sch�dzka"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Pl�novanie"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Stretnutie"
 
@@ -3909,11 +3950,12 @@ msgid "Classification"
 msgstr "Klasifik�cia"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Tajn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "D�tum a �as"
 
@@ -3922,12 +3964,12 @@ msgid "F_ree"
 msgstr "_Vo�n�"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "_S�kromn�"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Verejn�"
 
@@ -3937,7 +3979,7 @@ msgid "Show Time As"
 msgstr "Zobrazi� �as ako"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_S�hrn:"
 
@@ -3949,15 +3991,20 @@ msgstr "�as _konca:"
 msgid "_Start time:"
 msgstr "�as _za�iatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Organiz�tor je vy�adovan�."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Nutn� je aspo� jeden ��astn�k"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "T�to osoba sa u� z��ast�uje!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegova� na..."
 
@@ -3997,6 +4044,7 @@ msgid "Member"
 msgstr "�len"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4030,34 +4078,35 @@ msgid "_Change Organizer"
 msgstr "_Zmeni� organiz�tora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Pozva� ostatn�ch"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Pozva� ostatn�ch..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_In� organiz�tor"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "T�to sch�dzka obsahuje opakovanie, ktor� Evolution nedok�e upravi�."
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "zapnut�"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "de�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "v�skytov"
 
@@ -4121,19 +4170,15 @@ msgstr "t��d�ov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Chcete ulo�i� zmeny?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Inform�cia o sch�dzke sa zmenila. Chcete posla� upraven� verziu?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Inform�cia o �lohe sa zmenila. Chcete posla� upraven� verziu?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Polo�ka z�znamu sa zmenila. Chcete posla� upraven� verziu?"
 
@@ -4152,7 +4197,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4164,145 +4209,153 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.glade.h:4 calendar/gui/e-itip-control.c:692
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Popis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "_Po�iato�n� d�tum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Tajn�"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Term�n:"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:937 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Odstr�ni� vybran� kontakty"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Otvori�"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hn��"
 
-#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_Kop�rova�"
 
-#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "_Vlo�i�"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Ozna�i� ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "O_dstr�ni� t�to �lohu"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Ozna�i� �lohy ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "O_dstr�ni� vybran� �lohy"
 
-#: calendar/gui/e-calendar-table.c:1217
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknut�m prid�te �lohu"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4318,7 +4371,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -4349,8 +4402,8 @@ msgstr "D�tum �tartu"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "S�hrn"
 
@@ -4362,335 +4415,392 @@ msgstr "Triedenie �loh"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i rozdelen� min�ty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:769
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:771
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "popoludn�"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nov� celodenn� _udalos�"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Prejs� na d_ne�n� d�tum"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Prejs� na d�tum..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "O_dstr�ni� t�to sch�dzku"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Nastavi� tento v�skyt ako _presunute�n�"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Odstr�ni� tento v�_skyt"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Odstr�ni� _v�etky v�skyty"
 
-#: calendar/gui/e-itip-control.c:473
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr "Stretnutie za��na: <b>"
 
-#: calendar/gui/e-itip-control.c:478
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr "�loha za��na: <b>"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:534
 msgid "Free/Busy info begins: <b>"
 msgstr "Inform�cia o vo�nom �ase za��na: <b>"
 
-#: calendar/gui/e-itip-control.c:487
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr "Za��na: <b>"
 
-#: calendar/gui/e-itip-control.c:500
+#: calendar/gui/e-itip-control.c:550
 msgid "Meeting ends: <b>"
 msgstr "Stretnutie kon��: <b>"
 
-#: calendar/gui/e-itip-control.c:503
+#: calendar/gui/e-itip-control.c:553
 msgid "Free/Busy info ends: <b>"
 msgstr "Inform�cia o vo�nom �ase kon��: <b>"
 
-#: calendar/gui/e-itip-control.c:507
+#: calendar/gui/e-itip-control.c:557
 msgid "Ends: <b>"
 msgstr "Kon��: <b>"
 
-#: calendar/gui/e-itip-control.c:519
+#: calendar/gui/e-itip-control.c:571
 msgid "Task Completed: <b>"
 msgstr "�loha dokon�en�: <b>"
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:581
 msgid "Task Due: <b>"
 msgstr "Term�n �lohy: <b>"
 
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "inform�cie o kalend�ri"
+
 #. Title
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/e-itip-control.c:633
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:644 calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
 msgid "An unknown person"
 msgstr "Nezn�ma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Pros�m, skontrolujte tieto inform�cie a potom vyberte z menu akciu."
 
-#: calendar/gui/e-itip-control.c:683
+#: calendar/gui/e-itip-control.c:737
 msgid "<i>None</i>"
 msgstr "<i>�iadna</i>"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Vyberte akciu"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Aktualiz�cia �lohy"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Akceptovan�"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Predbe�n�"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Odmietnut�"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Inform�cie o vo�nom �ase"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Inform�cia o �lohe"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Zru�i�"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> poslal inform�cie o stretnut�."
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Inform�cie o stretnut�"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> po�aduje va�u ��as� na stretnut�."
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "N�vrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si praje by� pridan� na existuj�ce stretnutie."
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Aktualiz�cia stretnutia"
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si praje dosta� najnov�ie inform�cie o stretnut�."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Po�iadavka na aktualiz�ciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:745
+#: calendar/gui/e-itip-control.c:887
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpovedal na po�iadavku o stretnut�."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "Odpove� pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zru�il stretnutie."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Zru�enie stretnutia"
 
-#: calendar/gui/e-itip-control.c:755 calendar/gui/e-itip-control.c:803
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal nerozpoznate�n� spr�vu."
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Neplatn� spr�va o stretnut�"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> poslal inform�cie o �lohe."
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Inform�cia o �lohe"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> po�aduje, aby ste vykonali �lohu."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "N�vrh �lohy"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si praje by� pridan� do existuj�cej �lohy."
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Aktualiz�cia �lohy"
 
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si praje z�ska� najnov�ie inform�cie o �lohe."
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Po�iadavka na aktualiz�ciu �lohy"
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:937
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpovedal na priradenie �lohy."
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Odpove� pre �lohu"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zru�il �lohu."
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Zru�enie �lohy"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Neplatn� spr�va �lohy"
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publikoval inform�cie o vo�nom �ase."
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Inform�cie o vo�nom �ase"
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> po�aduje inform�ciu o va�om vo�nom �ase."
 
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Po�iadavka na inform�cie o vo�nom �ase"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:977
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpovedal na po�iadavku na inform�cie o vo�nom �ase"
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Odpove� s inform�cio o vo�nom �ase"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Neplatn� spr�va o vo�nom �ase"
 
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Spr�va nevyzer� ako platn�."
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "T�to spr�va obsahuje iba nepodporovan� po�iadavky."
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Pr�loha neobsahuje platn� spr�vu kalend�ra"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr "Pr�loha nem� �iadne zobrazite�n� polo�ky kalend�ra"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "S�bor kalend�ra nie je aktualizova�!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Aktualiz�cia dokon�en�\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav ��astn�ka nie je mo�n� aktualizova�, preto�e jeho stav nie je platn�!\n"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Stav ��astn�ka nie je mo�n� aktualizova�!\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Stav ��astn�ka bol aktualizovan�\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Stav ��astn�ka nie je mo�n� aktualizova�, preto�e polo�ka u� neexistuje"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nie je mo�n� odstr�ni� polo�ku zo s�boru s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Odstr�nenie dokon�en�"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Polo�ka poslan�!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Polo�ku nie je mo�n� posla�!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "Nepodarilo sa n�js� �iadnu z va�ich ident�t v zozname ��astn�kov!\n"
 
@@ -4731,216 +4841,211 @@ msgstr "d�tum konca"
 msgid "date-start"
 msgstr "d�tum za�iatku"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520 calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Predsedovia"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Vy�adovan� ��astn�ci"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Nepovinn� ��astn�ci"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Bez ��asti"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individu�lne"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Zdroj"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
-#: calendar/gui/e-meeting-model.c:691
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Miestnos�"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:692
-#: calendar/gui/e-meeting-model.c:708
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Nezn�my"
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
-#: calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Predseda"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522 calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Vy�adovan� ��astn�k"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Nepovinn� ��astn�k"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:707
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Bez ��asti"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Potrebn� �kony"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Akceptovan�"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
-#: calendar/gui/e-meeting-model.c:735
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Odmietnut�"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-model.c:736 calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Predbe�n�"
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
-#: calendar/gui/e-meeting-model.c:737
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegovan�"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "Prebieha"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-msgid "Chair Persons"
-msgstr "Predsedovia"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "Vy�adovan� ��astn�ci"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "Nepovinn� ��astn�ci"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-msgstr "Bez ��asti"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Mimo kancel�rie"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "�iadna inform�cia"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "_Pozva� ostatn�ch..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Nastavenie"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Zobrazi� _iba pracovn� hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Uk�za� z_men�en�"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Obnovi� vo�no/zanepr�zdnen�"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Autov�ber"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_V�etky osoby a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "V�etky _osoby a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Vy�adovan� osoby"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Vy�adovan� osoby a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "_Za�iatok stretnutia:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otv�ram �lohy na %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa na��ta� �lohy v `%s'"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nov� _sch�dzka..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je mo�n� otvori� prie�inok v `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Met�da nutn� k otvoreniu `%s' nie je podporovan�"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otv�ram kalend�ra na%s"
@@ -5001,230 +5106,275 @@ msgstr "Okt�ber"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Nutn� je aspo� jeden ��astn�k"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Organiz�tor mus� by� nastaven�."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Mus�te by� ��astn�kom stretnutia."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Nie je mo�n� vytvori� vytv�racie rozhranie pre komponent editora"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "�t"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybran� de� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybran� t��de� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Vybran� mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Vybran� rok (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "�_loha"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Stav:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorita:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "D�tum dokon�enia:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kateg�rie: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Kontakty:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Tla�i� kalend�r"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Uk�ka pred tla�ou"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Tla�i� polo�ku"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Nastavenie tla�iarne"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktor� bude zobrazova� prie�inok �loh"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Nie je mo�n� vytvori� kalend�rov� poh�ad. Pros�m, overte nastavenie ORBit a "
+"OAF."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5232,7 +5382,7 @@ msgstr ""
 "Evolution automaticky previedol �lohy z prie�inku kalend�ra do nov�ho "
 "prie�inku �loh."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5243,7 +5393,7 @@ msgstr ""
 "nov�ho prie�inku �loh.\n"
 "Niektor� �lohy nebolo mo�n� prenies�, tak�e je mo�n� sa o to pok�si� nesk�r."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5252,7 +5402,7 @@ msgstr ""
 "Nie je mo�n� otvori� `%s'; �iadne �daje z prie�inku kalend�ra nebud� "
 "preveden� do prie�inku �loh."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5261,83 +5411,83 @@ msgstr ""
 "Met�da pre na��tanie `%s' nie je podporovan�, �iadne polo�ky z prie�inku "
 "kalend�ra nebud� prenesen� do prie�inku �loh."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "NPUS�PS"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now neo�ak�va �iadne argumenty"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time o�ak�va 1 argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time o�ak�va ako prv� argument re�azec"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time o�ak�va prv� argument re�azec d�tumu/�asu pod�a ISO 8601"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day o�ak�va ako druh� argument cel� ��slo"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin o�ak�va jeden argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end o�ak�va jeden argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype neo�ak�va argumenty"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? o�ak�va ako druh� argument time_t"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? o�ak�va dva argumenty"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? o�ak�va ako prv� argument re�azec"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? o�ak�va ako druh� argument re�azec"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5345,11 +5495,11 @@ msgstr ""
 "contains? o�ak�va ako prv� argument jednu z hodn�t \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? o�ak�va aspo� jeden argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5357,19 +5507,19 @@ msgstr ""
 "has-categories? o�ak�va ako v�etky argumenty re�azce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? neo�ak�va �iadne argumenty"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? o�ak�va jeden argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? o�ak�va ako prv� argument time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Vyhodnotenie v�razu pre h�adanie neskon�ilo pravdivostnou hodnotou"
 
@@ -5393,7 +5543,7 @@ msgstr "�ifrovanie nie je podporovan� touto �ifrou"
 msgid "Decryption is not supported by this cipher"
 msgstr "De�ifrovanie nie je podporovan� touto �ifrou"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5404,7 +5554,7 @@ msgstr ""
 "�al�ie oper�cie na tomto serveri nebud� znovu vykonan�\n"
 "pri �al�om pripojen� na sie�."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5415,15 +5565,15 @@ msgstr ""
 "%s\n"
 "Zmeny v tomto prie�inku nebud� zosynchronizovan�."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Obnovujem synchroniz�ciu so serverom"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokon�enie tejto oper�cie mus�te pracova� on-line"
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Synchronizujem prie�inky"
 
@@ -5449,26 +5599,26 @@ msgstr "Zlyhala spr�va %d"
 msgid "Cannot open message"
 msgstr "Nie je mo�n� otvori� spr�vu"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Synchronizujem prie�inok"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Z�skavam spr�vu %d z %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na spr�ve %d z %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracov�van� filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykon�van� filtra: %s: %s"
@@ -5478,26 +5628,26 @@ msgstr "Chyba pri vykon�van� filtra: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykon�van� h�adania filtra: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovan� oper�cia: prida� spr�vu: pre %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovan� oper�cia: h�adanie v�razom: %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovan� oper�cia: h�adanie pomocou uid: %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Pres�vam spr�vy"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5506,7 +5656,7 @@ msgstr ""
 "Nie je mo�n� spracova� h�adac� v�raz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5515,110 +5665,110 @@ msgstr ""
 "Chyba pri vykon�van� h�adacieho v�razu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(odpoved� v�etk�mu) vy�aduje jeden pravdivostn� v�sledok"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie ot�zky na nezn�mej hlavi�ke: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neplatn� typ v body-contains, o�ak�vam re�azec"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nie je mo�n� vytvori� pomocn� r�ru pre zamykanie: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Nie je mo�n� spusti� pomocn� program pre z�mok: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Nepodarilo sa zamkn�� '%s': chyba protokolu s lock-helper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nepodarilo sa zamkn�� '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie je mo�n� vytvori� s�bor so z�mkom pre %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Vypr�al �as pri pokuse o z�skanie z�mku na %s. Sk�ste to nesk�r."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepodarilo sa z�ska� z�mok pomocou fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodarilo sa z�ska� z�mok pomocou flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nie je mo�n� skontrolova� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie je mo�n� otvori� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie je mo�n� otvori� do�asn� s�bor s po�tou %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nepodarilo sa ulo�i� po�tu v do�asnom s�bore %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nie je mo�n� vytvori� r�ru: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie je mo�n� vykona� fork: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail zlyhal: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Nezn�ma chyba)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Chyba pri ��tan� s�boru s po�tou: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Chyba pri z�pise po�ty do do�asn�ho s�boru: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Chyba kop�rovan� do�asn�ho s�boru: po�ty %s"
@@ -5633,83 +5783,83 @@ msgstr "Pros�m, zadajte va�e %s heslo pre %s"
 msgid "Please enter your %s passphrase"
 msgstr "Pros�m, zadajte va�e %s heslo"
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nie je mo�n� podp�sa� spr�vu: �iadny text na podpis"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Nie je mo�n� podp�sa� spr�vu: nezadan� heslo"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nie je mo�n� podp�sa� spr�vu: nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nie je mo�n� podp�sa� spr�vu: �iadny text pre podpis v texte"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nie je mo�n� overi� spr�vu: �iadny text na overenie"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie je mo�n� overi� spr�vu: nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Nie je mo�n� overi� spr�vu: nie je mo�n� vytvori� do�asn� s�bor: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nie je mo�n� za�ifrova� spr�vu: �iadny text na za�ifrovanie"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nie je mo�n� za�ifrova� spr�vu: nezadan� heslo"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nie je mo�n� za�ifrova� spr�vu: nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nie je mo�n� za�iftova� spr�vu: adres�ti nie s� definovan�"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Nie je mo�n� de�ifrova� spr�vu: �iadny �ifrovan� text na de�ifrovanie"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nie je mo�n� de�ifrova� spr�vu: nezadan� heslo"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nie je mo�n� de�ifrova� spr�vu: nie je mo�n� vytvori� r�ru do GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nie je mo�n� na��ta� %s: Na��tavanie modulov nie je na tomto syst�me "
 "podporovan�."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je mo�n� na��ta� %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je mo�n� na��ta� %s: V module nie je inicializa�n� k�d."
@@ -5729,7 +5879,7 @@ msgid "Connection cancelled"
 msgstr "Spojenie zru�en�"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je mo�n� spojenie s %s (port %d): %s"
@@ -5739,12 +5889,12 @@ msgid "(unknown host)"
 msgstr "(nezn�my hostite�)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Oper�cia zru�en�"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neo�ak�vane zru�il spojenie: %s"
@@ -5855,7 +6005,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Neplatn� odpove� na overenie od serveru."
 
@@ -5873,8 +6023,8 @@ msgid "Unknown authentication state."
 msgstr "Nezn�my stav overenia."
 
 #: 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Heslo"
 
@@ -5903,55 +6053,55 @@ msgstr "Prihl�senie POP pred SMTP nie pomocou zdroja POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regul�rneho v�razu zlyhal: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vy�aduje komponentu pou��vate�sk�ho mena"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vy�aduje komponentu hostite�a"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vy�aduje komponentu cesty"
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zis�ujem adresu: %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo h�adanie mena: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo h�adanie hostite�a: %s: hostite� nen�jden�"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo h�adanie hostite�a: %s: nezn�my d�vod"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Poskytovate� po�ty pre virtu�lny prie�inok"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre ��tanie po�ty ako ot�zky na in� mno�inu prie�inkov"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispoz�cii poskytovate�"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5997,15 +6147,15 @@ msgstr "Nepodarilo sa dek�dova� spr�vu."
 msgid "Failed to verify certificates."
 msgstr "Nepodarilo sa overi� certifik�ty"
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nie je mo�n� z�ska� prie�inok: Neplatn� oper�cia pre tento sklad"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nie je mo�n� vytvori� prie�inok: Neplatn� oper�cia pre tento sklad"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6015,7 +6165,7 @@ msgstr ""
 "Pre: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6030,7 +6180,7 @@ msgstr ""
 "\n"
 "Chcete ho aj tak akceptova�?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6049,37 +6199,37 @@ msgstr ""
 "�t�t: %s\n"
 "Krajina: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie je mo�n� spracova� URL `%s'"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Tak� spr�va neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "�iadna tak� spr�va: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je mo�n� odstr�ni� prie�inok: %s: Neplatn� oper�cia"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je mo�n� odstr�ni� prie�inok: %s: Prie�inok neexistuje"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je mo�n� premenova� prie�inok: %s: Neplatn� oper�cia"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je mo�n� premenova� prie�inok: %s: Prie�inok neexistuje"
@@ -6112,52 +6262,52 @@ msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je mo�n� vytvori� prie�inok %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie je mo�n� na��ta� s�hrn pre %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Prie�inok bol zni�en� a znovu vytvoren� na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "H�ad�m zmenen� spr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "T�to spr�va moment�lne nie je k dipoz�cii"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "S�ahujem s�hrnn� inform�cie pre nov� spr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "H�ad�m nov� spr�vy"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je mo�n� n�js� telo spr�vy v odpovedi FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie je mo�n� otvori� prie�inok pre vyrovn�vaciu pam�: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nepodarilo sa ulo�i� spr�vu %s: %s"
@@ -6170,7 +6320,7 @@ msgstr "Kontrolujem nov� po�tu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem nov� po�tu vo v�etk�ch prie�inkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Prie�inky"
 
@@ -6204,28 +6354,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Po�adovan� sp�sob overenia %s nie je podporovan� IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporovan�."
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6236,90 +6386,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Prie�inok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodi�ovsk� prie�inok nesmie obsahova� podprie�inky"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Po�tov� prie�inky vo form�te MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pre ukladanie lok�lnej po�ty v po�tov�ch prie�inkoch typu MH."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lok�lne doru�enie"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pre ukladanie lok�lnej po�ty v �tandardnom form�te mbox."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplikova� filtre na nov� spr�vy v prie�inku novej po�ty"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Po�tov� prie�inky vo form�te maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "Pre ukladanie lok�lnej po�ty v prie�inkov vo form�te maildir."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "�tandardn� Unixov� s�bor mbox"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Pre ��tanie a ukladanie lok�lnej po�ty v prie�inkov v �tandardnom form�te "
 "Unix mbox."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Kore� ukladania %s nie je absol�tna cesta"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Kore� ukladania %s nie je norm�lny prie�inok"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie je mo�n� z�ska� prie�inok: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lok�lne ukladanie nem� prie�inok pre nov� po�tu"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lok�lny po�tov� s�bor %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je mo�n� premenova� prie�inok %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� s�bor s�hrnu prie�inku `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� indexov� s�bor prie�inku`%s': %s"
@@ -6330,27 +6482,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "Nie je mo�n� ulo�i� s�hrn: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie je mo�n� prida� spr�vu do s�hrnu: nezn�my d�vod"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Pridanie spr�vy maildir zru�en�"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do prie�inku maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6359,20 +6511,20 @@ msgstr ""
 "Nie je mo�n� z�ska� spr�vu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Tak� spr�va neexistuje"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Neplatn� obsah spr�vy"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6381,15 +6533,15 @@ msgstr ""
 "Nie je mo�n� otvori� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Prie�inok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6398,19 +6550,19 @@ msgstr ""
 "Nie je mo�n� vytvori� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nie je prie�inok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je mo�n� odstr�ni� prie�inok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "nie je prie�inok maildir"
 
@@ -6425,33 +6577,33 @@ msgstr "Nie je mo�n� preh�ada� prie�inok `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie je mo�n� otvori� cestu po�tovej schr�nky: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie je mo�n� z�ska� z�mok na prie�inok %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie je mo�n� otvori� po�tov� schr�nku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Pridanie po�ty zru�en�"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do s�boru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6460,17 +6612,17 @@ msgstr ""
 "Nie je mo�n� z�ska� spr�vu: %s z prie�inku %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Prie�inok vyzer� ako nenapravite�ne po�koden�."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie spr�vy zlyhalo: Po�koden� po�tov� schr�nka?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6479,7 +6631,7 @@ msgstr ""
 "Nie je mo�n� otvori� s�bor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6488,14 +6640,14 @@ msgstr ""
 "Nie je mo�n� vytvori� s�bor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nie je norm�lny s�bor."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6504,110 +6656,110 @@ msgstr ""
 "Nie je mo�n� odstr�ni� prie�inok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Prie�inok `%s' nie je pr�zdny. Neodstr�nen�."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Uklad�m prie�inok"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie je mo�n� otvori� prie�inok %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Kritick� chyba spracovania spr�vy na poz�cii %ld v prie�inku %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie je mo�n� skontrolova� prie�inok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie je mo�n� otvori� s�bor %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie je mo�n� otvori� do�asn� po�tov� schr�nku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "S�hrn a prie�inok si neodpovedaj�, ani po synchroniz�cii"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Chyba pri z�pise do do�asnej schr�nky: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Z�pis do do�asnej schr�nky zlyhal: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie je mo�n� zatvori� zdrojov� prie�inok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je mo�n� zatvori� do�asn� prie�inok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je mo�n� premenova� prie�inok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezn�ma chyba: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Pridanie spr�vy MH zru�en�"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do prie�inok mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je prie�inok."
@@ -6617,49 +6769,49 @@ msgstr "`%s' nie je prie�inok."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie je mo�n� otvori� cestu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nie je mo�n� prida� spr�vu do s�boru fronty: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Fronta `%s' neexistuje alebo nie je norm�lny s�bor."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Prie�inok `%s/%s' neexistuje."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Lok�lny po�tov� s�bor %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Lok�lne prie�inky nie je mo�n� premenova�"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Lok�lne prie�inky nie je mo�n� odstr�ni�"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie je mo�n� synchronizova� do�asn� prie�inok %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie je mo�n� synchronizova� prie�inok fronty %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6668,67 +6820,67 @@ msgstr ""
 "Nie je mo�n� synchronizova� prie�inok fronty %s: %s\n"
 "Prie�inok je asi po�koden�, k�pia ulo�en� do `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nie je ulo�i�: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Pros�m, zadajte NNTP heslo pre %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Server odmietol pou��vate�sk� meno"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Nepodarilo sa posla� pou��vate�sk� meno na server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Server odmietol pou��vate�sk� meno/heslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Spr�va %s nen�jden�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nie je mo�n� z�ska� zoznam skup�n zo serveru."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nie je mo�n� na��ta� s�bor so zoznamom skup�n pre %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nie je mo�n� ulo�i� s�bor so zoznamom skup�n pre %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Diskusn� skupiny USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Toto je pr�stup k ��taniu a posielaniu do Diskusn�ch skup�n USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nie je mo�n� otvori� prie�inok pre server diskusn�ch skup�n: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusn� skupiny USENET pomocou %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6736,71 +6888,71 @@ msgstr ""
 "T�to mo�nos� nastav� overenie na NNTP server pomocou poslania hesla ako "
 "�ist�ho textu."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie je mo�n� otvori� alebo vytvori� s�bor .newsrc pre %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Z�skavam POP s�hrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nie je mo�n� skontrolova� nov� po�tu na POP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie je mo�n� otvori� prie�inok: zoznam spr�v nebol �pln�."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Odstra�ujem zmazan� spr�vy"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nie je mo�n� z�ska� spr�vu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie je mo�n� z�ska� spr�vu zo POP serveru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "�iadna spr�va s uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Z�skavam POP spr�vu %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Sklad spr�v"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Necha� po�tu na serveri"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Odstr�ni� po %s d�och"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Pre pripojenie a stiahnutie po�ty zo serverov POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6808,7 +6960,7 @@ msgstr ""
 "T�to vo�ba v�s spoj� s POP serverom pomocou hesla prenesen�ho ako �ist� "
 "text. To je �asto jedin� mo�nos�, ktor� POP servery podporuj�."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6818,32 +6970,32 @@ msgstr ""
 "APOP. Nemus� to fungova� pre v�etk�ch pou��vate�ov aj ke� server tvrd�, �e "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "T�to vo�ba v�s spoj� s POP serverom pomocou overenia Kerberos 4."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nepodarilo sa overi� na KPOP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nie je mo�n� sa spoji� so serverom: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie je mo�n� sa spoji� s POP serverom na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPros�m, zadajte POP3 heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6852,12 +7004,12 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� pou��vate�sk�ho mena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Nezn�my)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6865,7 +7017,7 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6874,194 +7026,194 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Prie�inok `%s' neexistuje."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Neo�ak�van� odpove� od POP serveru: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Pre doru�enie po�ty programom \"sendmail\" na tomto po��ta�i."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie je mo�n� vytvori� r�ru do sendmailu: %s: po�ta neodoslan�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nie je mo�n� spusti� sendmail: %s: po�ta neodoslan�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie je mo�n� posla� spr�vu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail skon�il so sign�lom %s: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie je mo�n� vykona� %s: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail skon�il so stavom %d: po�ta neodoslan�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "Nie je mo�n� n�js� v spr�ve adresu 'Od'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos po�ty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktick� chyba, pr�kaz nezn�my"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktick� chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Pr�kaz neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parameter pr�kazu neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stav syst�mu alebo odpove� na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Spr�va pomocn�ka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Slu�ba pripraven�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Slu�ba zatv�ra prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Slu�ba nie je k dispoz�cii, zatv�ram prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Po�adovan� po�tov� akcia v poriadku, dokon�en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, bude predan� pod�a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Po�adovan� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Po�adovan� akcia zru�en�: chyba pri spracovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, sk�ste <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Po�adovan� akcia nevykonan�: nedostatok miesta v syst�me"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Po�adovan� po�tov� akcia preru�en�: presiahnut� alok�cia miesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Po�adovan� akcia nevykonan�: meno po�tovej schr�nky nepovolen�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spusti� vstup po�ty, kon�� <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Vy�adovan� heslo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je pr�li� slab�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Po�adovan� �ifrovanie pre po�adovan� sp�sob overenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Do�asn� zlyhanie overenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autentifik�cia vy�adovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Chyba priv�tanie od serveru: %s : mo�no nie kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Po�adovan� sp�sob overenia %s nie je podporovan� SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPros�m, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7072,125 +7224,125 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doru�enie po�ty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je platn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Posielam spr�vu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je mo�n� posla� spr�vu: adres�ti nie s� definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Prihl�senie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytv�ran� overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypr�al �as po�iadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Po�iadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatn� odpove� na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Chyba odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Chyba odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Chyba odpovede DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Chyba odpovede DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede QUIT: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritick�"
@@ -7322,7 +7474,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Prilo�i� s�bor"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7331,29 +7483,29 @@ msgstr ""
 "Chyba pri ��tan� s�boru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Ulo�i� ako..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "S�bor existuje, prep�sa� ho?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladan� s�boru: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri na��tavan� s�boru: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7361,16 +7513,16 @@ msgstr ""
 "Nei je mo�n� otvori� prie�inok na koncepty pre tento ��et.\n"
 "Chcete pou�i� �tandardn� prie�inok na koncepty?"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri pr�stupe k s�boru: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je mo�n� z�ska� spr�vu z editora"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7379,7 +7531,7 @@ msgstr ""
 "Nepodarilo sa h�ada� v s�bore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7388,7 +7540,7 @@ msgstr ""
 "Nepodarilo sa skr�ti� s�bor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7397,7 +7549,7 @@ msgstr ""
 "Chyba pri automatickom ukladan� spr�v: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7405,7 +7557,7 @@ msgstr ""
 "Ximian Evolution na�iel neulo�en� s�bory z predch�dzaj�ceho sedenia.\n"
 "Chcete sa pok�si� o ich z�chranu?"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7415,23 +7567,23 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenen� spr�va"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Otvori� s�bor"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Vlo�i� s�bor"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Nap�sa� spr�vu"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7439,7 +7591,7 @@ msgstr ""
 "Nepodarilo sa vytvori� okno pre p�sanie spr�v:\n"
 "Nepodarilo sa aktivova� ovl�dac� prvok pre v�ber adresy."
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7447,7 +7599,7 @@ msgstr ""
 "Nepodarilo sa vytvori� okno pre p�sanie spr�v:\n"
 "Nepodarilo sa aktivova� komponent HTML editor."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7455,11 +7607,11 @@ msgstr ""
 "Nie je mo�n� vytvori� okno pre p�sanie spr�v, preto�e ste e�te\n"
 "nenastavili �iadne identity pre po�tov� komponent."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je mo�n� inicializova� editor spr�v Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:84
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7507,15 +7659,24 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Ulo�i� toto heslo"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "Zapam�ta� si heslo pre zvy�ok tohto sedenia"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -7566,30 +7727,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7725,7 +7886,7 @@ msgstr "Potom"
 msgid "Add action"
 msgstr "Prida� akciu"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7733,16 +7894,16 @@ msgstr ""
 "Zabudli ste vybra� prie�inok.\n"
 "Pros�m, vr�te sa a zadajte platn� prie�inok, kam doru�i� po�tu."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Vybra� prie�inok"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Zadajte URI prie�inku"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<kliknut�m vyberiete prie�inok>"
 
@@ -7759,39 +7920,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Meno pravidla: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Spusti� akcie"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "ak odpovedaj� v�etky krit�ri�"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "ak odpoved� niektor� krit�rium"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Prida� krit�rium"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "prijat�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "odoslan�"
 
@@ -7984,7 +8145,7 @@ msgstr "Odpovedan�"
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Odosielate�"
 
@@ -8016,7 +8177,7 @@ msgstr "za��na na"
 msgid "Stop Processing"
 msgstr "Zastavi� spracovanie"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Predmet"
@@ -8029,15 +8190,15 @@ msgstr "bolo po"
 msgid "was before"
 msgstr "bolo pred"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Pravidl�"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Prida� pravidlo"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Upravi� pravidlo"
 
@@ -8045,42 +8206,42 @@ msgstr "Upravi� pravidlo"
 msgid "Score Rules"
 msgstr "Pravidl� sk�re"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mus�te zada� aspo� jeden prie�inok ako zdrojov�."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje va�u star� po�ty Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importujem..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Pros�m, �akajte"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importujem %s ako %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "Preh�ad�vam %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:95
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Po�ta"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8088,19 +8249,15 @@ msgstr ""
 "Evolution na�iel po�tov� s�bory Elm.\n"
 "Chcete ich naimportova� do Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adres�r"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8108,23 +8265,23 @@ msgstr ""
 "Evolution na�iel s�bory GnomeCard.\n"
 "Chcete ich naimportova� do Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje va�e star� d�ta Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Preh�ad�vam prie�inok"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Sp���am import"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8132,11 +8289,11 @@ msgstr ""
 "Evolution na�iel po�tov� s�bory Netscape.\n"
 "Chcete ich naimportova� do Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje va�e star� d�ta Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8144,7 +8301,7 @@ msgstr ""
 "Evolution na�iel po�tov� s�bory Pine.\n"
 "Chcete ich naimportova� do Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -8180,40 +8337,40 @@ msgstr "Vytv�racie rozhranie pre komponent S�hrnu po�ty Evolution."
 msgid "Mail configuration interface"
 msgstr "Rozhranie pre nastavenie po�ty"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Prie�inok obsahuj�ci po�tu"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Prie�inok pre ukladanie po�ty (intern�)"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtu�lne odpadky"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtu�lny prie�inok s odpadkami"
 
-#: mail/component-factory.c:124
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Nie je mo�n� sa spoji� so skladom: %s"
 
-#: mail/component-factory.c:142
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Tento prie�inok nem��e obsahova� spr�vy."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Zmen� vlastnosti tohto prie�inku"
 
-#: mail/component-factory.c:746
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8221,28 +8378,28 @@ msgstr ""
 "Niektor� va�e nastavenia po�ty vyzeraj� ako po�koden�. Pros�m, skontrolujte, "
 "�e je v�etko v poriadku."
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Nov� spr�va"
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Nov� _spr�va"
 
-#: mail/component-factory.c:933
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je mo�n� inicializova� po�tov� komponent Evolution."
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie je mo�n� inicializova� konfigura�n� komponent pre po�tu Evolution."
 
-#: mail/component-factory.c:948
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Nie je mo�n� inicializova� komponent pre infom�cie o prie�inkoch Evolution."
 
-#: mail/component-factory.c:1113
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Nie je mo�n� zaregistrova� sklad u shellu"
 
@@ -8255,168 +8412,173 @@ msgstr "Vlastnosti \"%s\""
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d nov�ch"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "skryt�ch %d"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d vybran�ch"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlan�ch"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d poslan�ch"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Vytvori� vPrie�inok z v�sledku h�adania"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "Vprie�inok na _predmet"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "Vprie�inok na _odosielate�a"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "Vprie�inok na _adres�tov"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VPrie�inok na _konferenciu"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielate�ovi"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adres�toch"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Upravi� ako nov� spr�vu..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Ulo�i� _ako..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Tla�i�"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Odpoveda� odosielate�ovi"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Odpoveda� _zoznamu"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Odpoveda� _v�etk�m"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "Posla� �_alej"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Ozna�i� ako _pre��tan�"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Ozna�i� ako _nepre��tan�"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Ozna�i� ako _d�le�it�"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Ozna�i� ako ned�_le�it�"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Pre_sun�� do prie�inka..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Kop�rova� do prie�inku..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "Obnovi� _zmazan�"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Prida� odosielate�a do adres�ra"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Pou�i� filtre"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Vytvori� pra_vidlo zo spr�vy"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VPrie�inok na konferenciu"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrie�inok na konferenciu (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�_tandardn�"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Z�skanie inform�cie o prie�inku"
@@ -8511,7 +8673,7 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Nem��ete vytvori� dva ��ty s rovnak�m menom."
 
@@ -8527,52 +8689,52 @@ msgstr "Zak�za�"
 msgid "Enable"
 msgstr "Povoli�"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstr�ni� tento ��et?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Neodstra�ova�"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Naozaj odstr�ni� ��et?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstr�ni� tento ��et diskusn�ch skup�n?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Nastavenie po�ty"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Po�ta pre %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Po�ta od %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Prida� pravidlo filtra"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8584,7 +8746,7 @@ msgstr ""
 "posiela�, prij�ma� alebo p�sa� po�tu.\n"
 "Chcete ho nastavi� teraz?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8592,7 +8754,7 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� identitu."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8600,12 +8762,12 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� sp�sob prenosu.."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Nem�te nastaven� sp�sob prenosu po�ty"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8613,11 +8775,11 @@ msgstr ""
 "Posielate spr�vu form�tovan� ako HTML, ale nasleduj�ci adres�ti nechc� "
 "dost�va� takto form�tovan� po�tu:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Posla� aj tak?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8625,7 +8787,7 @@ msgstr ""
 "T�to spr�va nem� predmet.\n"
 "Naozaj ju chcete posla�?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8633,11 +8795,11 @@ msgstr ""
 "Ked�e je zoznam kontaktov, ktor� posielate, nastaven� tak, aby skryl adresy, "
 "t�to spr�va bude obsahova� iba pr�jemcov Bcc."
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "T�to spr�va obsahuje iba adres�tov Bcc."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8647,40 +8809,40 @@ msgstr ""
 "Apparently-To.\n"
 "Posla� aj tak?"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "T�to spr�va obsahuje neplatn�ch adres�tov:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Mus�te zada� adres�tov pre poslanie tejto spr�vy."
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Mus�te nastavi� ��et pred poslan�m tejto spr�vy."
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "nezn�my odosielate�"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "D�a %a, %Y-%m-%d at %H:%M, %%s nap�sal:"
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Presun�� spr�vu do"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kop�rova� spr�vu do"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upravi� v�etk�ch %d spr�v?"
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8688,7 +8850,7 @@ msgstr ""
 "Upravova� m��ete iba spr�vy ulo�en�\n"
 "v prie�inku Koncepty."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8696,28 +8858,28 @@ msgstr ""
 "Iba spr�vy z prie�inku Odoslan� je mo�n�\n"
 "znovu posla�."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu posla� v�etk�ch %d spr�v?"
 
-#: mail/mail-callbacks.c:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "�iadna vybran� spr�va"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Ulo�i� spr�vu ako..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Ulo�i� spr�vy ako..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8729,11 +8891,11 @@ msgstr ""
 "\n"
 "Naozaj odstr�ni� tieto spr�vy?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "T�to spr�vu u� nezobrazova�."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8742,19 +8904,19 @@ msgstr ""
 "Chyba pri na��tavan� inform�cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Tla�i� spr�vu"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Tla� spr�vy zlyhala"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvori� v�etk�ch %d spr�v v samostatn�ch okn�ch?"
@@ -8810,7 +8972,7 @@ msgstr ""
 "Toto meno bude pou��van� iba pre zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca ��tom Evolution"
 
@@ -8950,7 +9112,7 @@ msgstr "Zobrazenie"
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Koncepty"
 
@@ -9096,7 +9258,7 @@ msgid "Sending Mail"
 msgstr "Posielanie po�ty"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Odoslan�"
 
@@ -9344,23 +9506,23 @@ msgstr "Skry�"
 msgid "External Viewer"
 msgstr "Extern� zobrazova�"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Na��tavam obsah spr�vy"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Otvori� odkaz v prehliada�i"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kop�rova� umiestnenie odkazu"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Ulo�i� odkaz ako"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Ulo�i� obr�zok ako..."
 
@@ -9377,27 +9539,27 @@ msgstr "Nie je mo�n� spracova� spr�vu MIME. Zobrazujem ako zdrojov� k�d."
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Neplatn� adresa"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -9449,11 +9611,11 @@ msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Nespr�vna �as� extern�ho tela."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavujem prie�inok"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9462,27 +9624,27 @@ msgstr ""
 "Nie je mo�n� ulo�i� metainform�cie prie�inku, asi zist�te,\n"
 "�e ho nie je mo�n� ani otvori�: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie je mo�n� ulo�i� metainform�cie prie�inku do %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie je mo�n� odstr�ni� metainform�cie prie�inku %s: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Men� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s nie je mo�n� znovu nastavi�, preto�e to nie je lok�lny prie�inok"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9490,16 +9652,16 @@ msgstr ""
 "Ak nem��ete otvori� t�to po�tov� schr�nku, potom\n"
 "ju budete musie� opravi� ru�ne."
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nem��ete zmeni� form�t nelok�lnych prie�inkov."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastavi� /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9508,7 +9670,7 @@ msgstr ""
 "Chyba po�as '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9517,7 +9679,7 @@ msgstr ""
 "Chyba pri vykon�van� oper�cie:\n"
 "%s"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Pracujem"
 
@@ -9529,48 +9691,43 @@ msgstr "Filtrujem prie�inok"
 msgid "Fetching Mail"
 msgstr "Prij�mam po�tu"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Ale spr�va bola �spe�ne odoslan�."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam spr�vu %d z %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na spr�ve %d z %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Dokon�en�."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Uklad�m spr�vu do prie�inku"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pres�vam spr�vy do %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kop�rujem spr�vy do %s"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Nie je mo�n� skop�rova� prie�inok `%s' s�m do seba"
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Premiest�ujem"
@@ -9585,7 +9742,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "Prech�dzam prie�inky v \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Odpadky"
 
@@ -9686,74 +9843,74 @@ msgstr "Znovu sa pripojujem na %s"
 msgid "_Search"
 msgstr "_N�js�"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Spr�va bez mena)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Spr�va bez mena"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Pr�zdna spr�va"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "N�js� v spr�ve"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Rozli�ova� ve�kos� p�smen"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "H�ada� dopredu"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "H�ada�:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Odpoved�:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Ru��m..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Pr�jem a odoslanie po�ty"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Zru�i� v�etko"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "�ak�m..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Zru�en�."
 
@@ -9761,15 +9918,6 @@ msgstr "Zru�en�."
 msgid "User canceled operation."
 msgstr "Pou��vate� zru�il oper�ciu."
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr "Ulo�i� toto heslo"
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr "Zapam�ta� si heslo pre zvy�ok tohto sedenia"
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9779,30 +9927,30 @@ msgstr "Zadajte va�e heslo pre %s"
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predan� spr�va - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Predan� spr�va"
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Predan� spr�va"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavujem vprie�inok: '%s'"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizujem vprie�inky pre uri: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9815,20 +9963,20 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizovan�."
 
-#: mail/mail-vfolder.c:637
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VPrie�inky"
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "Upravi� vprie�inok"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pok�s o �pravu vprie�inku '%s', ktor� neexistuje."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nov� vPrie�inok"
 
@@ -9897,7 +10045,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Generujem zoznam spr�v"
 
@@ -9933,16 +10081,16 @@ msgstr "Prihlasujem si prie�inok \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z prie�inku \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Prie�inok"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Nebol vybran� �iadny server"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Pros�m, vyberte server."
 
@@ -9982,88 +10130,90 @@ msgstr "O_dhl�si�"
 msgid "Evolution component for the executive summary."
 msgstr "Komponent Evolution pre S�hrn."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Prie�inok obsahuj�ci s�hrn Evolution"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "Nie je mo�n� inicializova� komponent s�hrnu Evolution."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Sch�dzky"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "�iadne sch�dzky"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "S�hrn po�ty"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "LZIB:LZTT:LKPR"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo d�a"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Cit�t d�a"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Prida� nov� kan�l spr�v"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL nov�ho kan�lu spr�v, ktor� chcete prida�"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Meno:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Nastavenie s�hrnu"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Chyba na��tavania RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Kan�ly spr�v"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "�iadne �lohy"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(�iadny popis)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moje po�asie"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Server po�asia nemohol by� kontaktovan�</b></dd>"
 
@@ -10071,31 +10221,23 @@ msgstr "<dd><b>Server po�asia nemohol by� kontaktovan�</b></dd>"
 msgid "Weather"
 msgstr "Po�asie"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "LZIB:LZTT:LKPR"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Oblasti"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Tla� s�hrnu"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Tla� s�hrnu zlyhala"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent s�hrnu nemohol inicializova� Bonobo.\n"
 
@@ -11398,31 +11540,31 @@ msgstr "_Po�asie"
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Zobrazi� detaily"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Zru�i� oper�ciu"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Doru�en� po�ta"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Odoslan� po�ta"
 
-#: shell/e-local-storage.c:637
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Lok�lne prie�inky"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "In�tal�cia Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11430,16 +11572,16 @@ msgstr ""
 "T�to nov� verzia Evolution vy�aduje in�tal�ciu dodato�n�ch s�borov\n"
 "do v�ho osobn�ho prie�inku Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizova� s�bory"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11450,7 +11592,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11459,7 +11601,7 @@ msgstr ""
 "Nastala chyba po�as kop�rovania s�borov do\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11470,7 +11612,7 @@ msgstr ""
 "Pros�m, presu�te ho, aby mohli\n"
 "by� nain�talovan� s�bory Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11482,7 +11624,7 @@ msgstr ""
 "Mus� by� odstr�nen� pred spusten�m Evolution.\n"
 "Chcete ho odstr�ni�?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11493,6 +11635,19 @@ msgstr ""
 "to prie�inok Evolution. Pros�m, presu�te ho,\n"
 "aby mohli by� nain�talovan� s�bory Evolution."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Nie je mo�n� presun�� prie�inok do seba."
@@ -11557,10 +11712,16 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenova� prie�inok \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Premenova� prie�inok"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Zadan� meno prie�inku nie je platn�: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11570,32 +11731,11 @@ msgstr ""
 "Zadan� prie�inok sa ned� vytvori�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Nezadan� meno prie�inku."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Meno prie�inku nesmie obsahova� znak Enter."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Prie�inok nesmie obsahova� odde�ova� prie�inkov."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' a '..' s� rezervovan� men� prie�inkov."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Zadan� meno prie�inku nie je platn�: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvori� nov� prie�inok"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11603,19 +11743,19 @@ msgstr ""
 "Typ vybran�ho prie�inku nie je platn�\n"
 "pre po�adovan� oper�ciu."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nov�..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Vyberte typ import�ra, ktor� chcete spusti�"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11629,13 +11769,13 @@ msgstr ""
 "Pou�ijte \"Automaticky\" ak typ nepozn�te a Evolution sa\n"
 "ho pok�si ur�i�."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Pros�m, vyberte inform�cie, ktor� chcete importova�"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11646,7 +11786,7 @@ msgstr ""
 "Import�r nie je pripraven�.\n"
 "�ak�m 5 sek�nd a sk�sim to znovu."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11655,16 +11795,16 @@ msgstr ""
 "Importujem %s\n"
 "Importujem polo�ku %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "S�bor %s neexistuje"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Do lok�lnych prie�inkov m��ete iba importova�"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11674,11 +11814,11 @@ msgstr ""
 "%s\n"
 "nie je k dispoz�cii import�r."
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11687,17 +11827,17 @@ msgstr ""
 "Importujem %s\n"
 "Za��nam %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri �tarte %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri na��tavan� %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11706,31 +11846,31 @@ msgstr ""
 "Importujem %s\n"
 "Importujem polo�ku 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Meno s�boru:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Vyberte s�bor"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Typ s�boru:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Importova� d�ta a nastavenia zo star��ch programov"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Importova� jeden s�bor"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11738,41 +11878,48 @@ msgstr ""
 "Pros�m, �akajte...\n"
 "H�ad�m existuj�ce nastavenie"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Sp���am inteligentn� importy"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Vybra� prie�inok"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cie�ov� prie�inok pre import t�chro d�t"
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Zatv�ram spojenia..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d) Nie je mo�n� spusti� rozhranie Evolution Po�tov� asistent\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "(%s:%d) Nie je mo�n� spusti� rozhranie Evolution Po�tov� asistent\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11780,11 +11927,28 @@ msgstr ""
 "Pros�m, vyberte inform�cie, ktor�\n"
 "chcete importova�"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Nezadan� meno prie�inku."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Meno prie�inku nesmie obsahova� znak Enter."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Tento prie�inok nem��e obsahova� spr�vy."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' a '..' s� rezervovan� men� prie�inkov."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "N�stroj pre oznamovanie ch�b nebol n�jden� v $PATH."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Ned� sa spusti� n�stroj pre oznamovanie ch�b"
 
@@ -11818,11 +11982,15 @@ msgid "Error executing %s."
 msgstr "Chyba pri vykon�van� %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Pracova� on-line"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "_Pracova� off-line"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Pracova� off-line"
 
@@ -11830,49 +11998,39 @@ msgstr "Pracova� off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazen� �iadny prie�inok)"
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(�iadna)"
 
-#: shell/e-shell-view.c:1595
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1597
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je moment�lne on-line. Stla�en�m tohto tla�idla prejdete do "
 "m�du off-line."
 
-#: shell/e-shell-view.c:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution prech�dza do m�du off-line."
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je moment�lne off-line. Stla�en�m tohto tla�idla prejdete "
 "do m�du on-line."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvori� lok�lny sklad -- %s"
 
-#: shell/e-shell.c:1656
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11883,35 +12041,31 @@ msgstr ""
 "neo�ak�vane skon�il. Mus�te ukon�i� Evolution a znovu ju\n"
 "spusti�, aby ste z�skali pr�stup k va�im d�tam."
 
-#: shell/e-shell.c:1879 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1881
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Neplatn� argumenty"
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Nie je mo�n� zaregistrova� u OAF"
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfigura�n� datab�za nen�jden�"
 
-#: shell/e-shell.c:1887 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "V�eobecn� chyba"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11920,111 +12074,111 @@ msgstr ""
 "Naozaj chcete odstr�ni� skupinu\n"
 "`%s' z panelu skratiek?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Neodstra�ova�"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Premenova� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Premenova� t�to skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Mal� ikony"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Zobrazi� skratky ako mal� ikony"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Zobrazi� skratky ako ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nov� skupina..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Odst_r�ni� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Odstr�ni� t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Premenova� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Premenuje t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Premenova� skratku"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Premenova� t�to skratku na:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvori� prie�inok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Otvori� v _novom okne"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otvor� prie�inok spojen� s touto skratkou v novom okne"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Premenova�"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Premenuje t�to skratku"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "O_dstr�ni�"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstr�ni� t�to skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladan� skratiek."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Skratky"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12033,133 +12187,133 @@ msgstr ""
 "Nie je mo�n� prenies� prie�inok:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Bez mena)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "�iadna chyba"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Prie�inok s t�mto menom u� existuje"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Uveden� typ prie�inku nie je platn�"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie prie�inku"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Prie�inok je pr�zdny"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Uveden� prie�inok nebol n�jden�"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovan�"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Oper�cia nepodporovan�"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Uveden� typ nie je podporovan� t�mto skladom"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uveden� prie�inok nie je mo�n� zmeni� alebo odstr�ni�"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie je mo�n� presun�� prie�inok do jednoho zo svoj�ch podprie�inkov."
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvori� prie�inok s t�mto menom"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotov�ch)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Preru�en�"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Neplatn� argumenty"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "U� je vlastn�k"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "�iadny vlastn�k"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Nen�jden�"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Nepodporovan� typ"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Nepodporovan� sch�ma"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Nepodporovan� oper�cia"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Intern� chyba"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Neplatn� URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "M� podprie�inky"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "�iadne vo�n� miesto"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Star� vlastn�k skon�il"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -12170,7 +12324,7 @@ msgstr ""
 "\n"
 "Nezn�ma chyba."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -12183,7 +12337,7 @@ msgstr ""
 "Chyba z komponentov�ho syst�mu:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12292,84 +12446,68 @@ msgstr ""
 "Tento sprievodca v�m pom��e importova�\n"
 "extern� s�bory do Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importy"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Neimportova�"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "T�to spr�vu u� nezobrazova�"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution na�iel tieto s�bory d�t pre import:"
 
-#: shell/main.c:90
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution kon��..."
 
-#: shell/main.c:194
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Vitajte.  V�aka za �as str�ven� s�ahovan�m tejto uk�ky\n"
-"groupwarov�ho n�stroja Ximian Evolution.\n"
-"\n"
-"Ximian Evolution e�te st�le nie je dokon�en�. U� je bl�zko, ale e�te st�le\n"
-"niektor� jej fukcie ch�baj� alebo nefunguj� �plne.\n"
-"\n"
-"Ak n�jdete chyby, pros�m, ozn�mte n�m ich na bugzilla.ximian.com.\n"
-"Tento produkt neposkytuje �iadne z�ruky a nie je ur�en� pre �ud�,\n"
-"ktor� sa nevedia ovl�da�.\n"
-"\n"
-"D�fame, �e v�s pote�ia v�sledky na�ej �a�kej pr�ce a netrpezlivo\n"
-"�ak�me na v� pr�spevok!\n"
-
-#: shell/main.c:215
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"V�aka\n"
-"T�m Ximian Evolution\n"
-
-#: shell/main.c:269
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je mo�n� inicializova� shell Ximian Evolution."
 
-#: shell/main.c:278
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je mo�n� inicializova� shell Ximian Evolution: %s"
 
-#: shell/main.c:348
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Zak�za� �vodn� okno"
 
-#: shell/main.c:349
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Posla� ladiaci v�stup zo v�etk�ch komponent od s�boru."
 
-#: shell/main.c:391
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je mo�n� inicializova� komponentov� syst�m Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Chyba pri na��tavan� s�boru: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Otvori� s�bor"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Vlo�i� s�bor"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Nezadan� meno prie�inku."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12649,11 +12787,12 @@ msgstr "Tla�i�..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Ulo�i�"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Ulo�i� a zavrie�"
 
@@ -12669,7 +12808,7 @@ msgstr "Ulo�i� t�to polo�ku na disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_S�bor"
@@ -12691,7 +12830,7 @@ msgstr "Ulo�i� kontakt a zatvori� dial�g"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Ulo�i�"
 
@@ -12751,10 +12890,6 @@ msgstr "Napl�nova� stretnutie pre t�to polo�ku"
 msgid "Customise My Evolution"
 msgstr "Prisp�sobi� moje Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Zru�i�"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Zru�i� aktu�lnu po�tov� oper�ciu"
@@ -13319,7 +13454,7 @@ msgstr "Zavrie toto okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Zavrie�"
@@ -13350,8 +13485,9 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Za�ifrova� t�to spr�vu va��m �ifrovac�m certifik�tom S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "_Form�t"
+#, fuzzy
+msgid "For_mat"
+msgstr "Form�t"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
@@ -13402,7 +13538,7 @@ msgid "Save in folder..."
 msgstr "Ulo�i� v prie�inku..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Ulo�i� aktu�lny s�bor"
 
@@ -13495,7 +13631,7 @@ msgid "_From Field"
 msgstr "Pole _Od"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vlo�i�"
 
@@ -13511,7 +13647,7 @@ msgstr "Pole _Reply-To"
 msgid "_Security"
 msgstr "Za_bezpe�enie"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pomocn�k"
 
@@ -13748,10 +13884,6 @@ msgstr "_Skratka"
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "_Pracova� off-line"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Zmen� nastavenie s�hrnu"
@@ -13836,114 +13968,114 @@ msgstr "Definova� poh�ady"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PUS�PSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Dnes"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "�as mus� by� vo form�te: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentu�lna hodnota mus� by� medzi 0 a� 100"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Pobaltsk�"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Stredoeur�pska"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "��nska"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Gr�cka"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonsk�"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "K�rejsk�"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Tureck�"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Z�padoeur�pska"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradi�n�"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Zjednodu�en�"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrajinsk�"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nov�"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nezn�ma znakov� sada: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Zadajte znakov� sadu, ktor� chcete pou�i�"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "In�..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Znakov� sada"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor h�adania"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Ulo�i� h�adanie"
 
@@ -13980,11 +14112,11 @@ msgstr "Spr�va"
 msgid "Don't show this message again."
 msgstr "T�to spr�vu u� nezobrazova�."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_N�js�"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "N�js�"
 
@@ -13998,18 +14130,83 @@ msgstr "Osobn� adres�rov� server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Vytv�racie rozhranie kalend�ra pre Osobn� kalend�rov� server."
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): Nie je mo�n� inicializova� GNOME"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): Nie je mo�n� inicializova� GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je mo�n� inicializova� Bonobo"
 
+#~ msgid "_Invite Others"
+#~ msgstr "_Pozva� ostatn�ch"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Tajn�"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Nie je mo�n� skop�rova� prie�inok `%s' s�m do seba"
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "LZIB:LZTT:LKPR"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "LZIB:LZTT:LKPR"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Prie�inok nesmie obsahova� odde�ova� prie�inkov."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Vitajte.  V�aka za �as str�ven� s�ahovan�m tejto uk�ky\n"
+#~ "groupwarov�ho n�stroja Ximian Evolution.\n"
+#~ "\n"
+#~ "Ximian Evolution e�te st�le nie je dokon�en�. U� je bl�zko, ale e�te "
+#~ "st�le\n"
+#~ "niektor� jej fukcie ch�baj� alebo nefunguj� �plne.\n"
+#~ "\n"
+#~ "Ak n�jdete chyby, pros�m, ozn�mte n�m ich na bugzilla.ximian.com.\n"
+#~ "Tento produkt neposkytuje �iadne z�ruky a nie je ur�en� pre �ud�,\n"
+#~ "ktor� sa nevedia ovl�da�.\n"
+#~ "\n"
+#~ "D�fame, �e v�s pote�ia v�sledky na�ej �a�kej pr�ce a netrpezlivo\n"
+#~ "�ak�me na v� pr�spevok!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "V�aka\n"
+#~ "T�m Ximian Evolution\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "_Form�t"
+
 #~ msgid "Alarm on %A %b %d %Y %H:%M"
 #~ msgstr "Poplach o %A %b %d %Y %H:%M"
 
diff --git a/po/sl.po b/po/sl.po
index 2fc3db0e2b..e88c9789a9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Uvozi datoteke eVizitk v Evolucijo. "
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
@@ -21,308 +31,313 @@ msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
 msgid "Imports VCard files into Evolution."
 msgstr "Uvozi datoteke eVizitk v Evolucijo. "
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Ime"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Prvi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Pomočnik"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Služba"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Zaseden"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Kopiraj"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Avto"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Službeni faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Službeni faks"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Služba"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Zaseden"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Doma 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Drugo"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radijo"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-naslov 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-naslov 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Pisarna"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "maj"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Koledar"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "Ob_letnica:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "kategorije"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Polno ime"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -330,7 +345,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -338,7 +353,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -346,7 +361,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -354,7 +369,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -362,7 +377,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -370,7 +385,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -378,7 +393,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -386,7 +401,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -394,7 +409,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -402,7 +417,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -410,7 +425,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -418,7 +433,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -426,7 +441,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -434,7 +449,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -442,7 +457,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -450,7 +465,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -458,7 +473,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -466,7 +481,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -474,7 +489,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -482,7 +497,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -490,7 +505,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -498,7 +513,7 @@ msgstr ""
 "\n"
 "Časovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -506,7 +521,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -514,7 +529,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -522,7 +537,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -530,7 +545,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -538,7 +553,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -546,7 +561,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -554,7 +569,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -562,7 +577,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -570,7 +585,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -588,7 +603,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -596,7 +611,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -604,11 +619,11 @@ msgstr ""
 "\n"
 "Javni ključ: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Več eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
@@ -617,39 +632,41 @@ msgstr "eVizitka za %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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Nastavitve..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Čakam..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr ""
@@ -657,55 +674,55 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitke..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -749,46 +766,46 @@ msgstr "Tovarna za Adresarjev vznik naslova"
 msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorčno kontrolo adresarja"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Stik"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Nov stik:"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Nov stik:"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Seznam _stikov"
@@ -822,7 +839,7 @@ msgid "Base"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Osnove"
 
@@ -908,16 +925,16 @@ msgstr "Ime _računa:"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Uredi"
@@ -934,15 +951,20 @@ msgstr "_Vrata:"
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Nisem mogel inicializirati gnome-vfs"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -951,7 +973,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -963,7 +985,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -971,42 +993,42 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Vpišite geslo za %s"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-naslov vsebuje"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -1019,51 +1041,51 @@ msgstr "URI, ki naj ga prikaže brskalnik map"
 msgid "(none)"
 msgstr "(brez)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Izberi dejanje"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Ustvari nov stik \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Poizvedujem v adresarju..."
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Uredi podatke stika"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "Zlij E-poštne naslove"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Izključi poizvedbe"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
@@ -1075,50 +1097,59 @@ msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstrani"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Odstrani vse"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "Pošlji pošto v obliki HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
@@ -1178,12 +1209,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1251,9 +1282,9 @@ msgstr "_Stiki..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Zbriši"
@@ -1322,37 +1353,47 @@ msgstr "Ste prepričani, da želite zbrisati ta račun?"
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Meglice"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2504,7 +2545,7 @@ msgid "contact-list-editor"
 msgstr "Urejevalnik stikov"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
@@ -2553,153 +2594,160 @@ msgstr ""
 "Spremenjeno ime ali e-poštni naslov tega stika že\n"
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "ni pričeto"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Natisni vizitko"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d sekund"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot eVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Odpri"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Posreduj _pripeto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Zbriši"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Vizitka ni bila najdena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "ID vizitke že obstaja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "preklicano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Želite shraniti spremembe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2707,75 +2755,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2961,94 +3018,109 @@ msgstr "Širina:"
 msgid "_Font..."
 msgstr "_Pisava..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Natisni vizitke"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Natisni vizitko"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Natisni kuverto"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Uredi sestanek"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "visoka"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "nizka"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Kontrola Bonobo, ki prikaže koledar."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Kontrola Bonobo, ki prikaže koledar."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolucijin pregledovalnik iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Komponenta Evolucije za urejanje koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Tovarna komponent za povzetke koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Tovarna za Evolucijino komponento pošte."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Tvoarna za orodje koledarja iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Vzorčna tovarna za kontrolo koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
@@ -3061,47 +3133,30 @@ msgstr "Storitev opozorilnega alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Obvestilo o vašem sestanku, ki se začne ob %s in konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "Obvestilo o vašem sestanku, ki se začne ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "Obvestilo o vašem sestanku, ki se konča ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
-msgstr "Obvestilo o vašem sestanku"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Nastavitve"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
-msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Datum zaključka"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "_Čas konca:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr "Obvestilo o vašem opravilu"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolucija"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm na %A %d %b %Y ob %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarmi"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3120,11 +3175,11 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3132,7 +3187,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3143,137 +3198,116 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisem mogel inicializirati gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Zaseden"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "končano"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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: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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datum mora biti vpisan v obliki: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3283,53 +3317,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Določena"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Nastavitve..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dnevni pogled"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Pogled delavnega tedna"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Tedenski pogled"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Mesečni pogled"
 
@@ -3345,12 +3382,12 @@ msgstr "Opis vsebuje"
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -3358,9 +3395,9 @@ msgstr "Koledar"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
@@ -3370,25 +3407,25 @@ msgstr "Naloge"
 msgid "Folder containing to-do items"
 msgstr "vMapa glede na dopisni seznam"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Nova naloga"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -3458,48 +3495,48 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 sekunda"
 
@@ -3557,17 +3594,12 @@ msgstr "po koncu sestanka"
 msgid "%s at the end of the appointment"
 msgstr "po koncu sestanka"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, c-format
-msgid "%s at an unknown time"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s%s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3588,7 +3620,7 @@ msgstr "Opomnilniki"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -3618,7 +3650,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3671,7 +3703,7 @@ msgid "First day of wee_k:"
 msgstr "Prvi dan ted_na:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "petek"
 
@@ -3684,7 +3716,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -3694,7 +3726,7 @@ msgid "O_verdue tasks:"
 msgstr "Naloge s p_rekoračenim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "sobota"
 
@@ -3715,7 +3747,7 @@ msgid "Su_n"
 msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -3732,7 +3764,7 @@ msgid "Tas_ks due today:"
 msgstr "Nalo_ge z današnjim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -3753,12 +3785,12 @@ msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "torek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -3829,116 +3861,121 @@ msgstr "_sre"
 msgid "before the start of the appointment"
 msgstr "pred pričetkom sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo zbrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Ta dnevniški vpis je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ničesar niste spremenili, zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Ta dnevniški vpis je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Nisem mogel pravilno posodobiti datotek"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3946,53 +3983,53 @@ msgstr ""
 "Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ste prepričani, da želite zbrisati %d sestankov?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
@@ -4009,26 +4046,26 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Načrtuj sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Sestanek"
 
@@ -4047,11 +4084,12 @@ msgid "Classification"
 msgstr "Uvrstitev"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Zaupno"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Datum in ura"
 
@@ -4060,12 +4098,12 @@ msgid "F_ree"
 msgstr "P_rost"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vatno"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Javno"
 
@@ -4075,7 +4113,7 @@ msgid "Show Time As"
 msgstr "Kaži čas kot"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_Povzetek:"
 
@@ -4087,32 +4125,20 @@ msgstr "_Čas konca:"
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
-msgstr "Ta oseba se je že udeleženec sestanka!"
-
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Chair Persons"
-msgstr "Predsedujoči"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr "Potrebni udeleženci"
+#: calendar/gui/dialogs/meeting-page.c:422
+#, fuzzy
+msgid "An organizer is required."
+msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr "Možni udeleženci"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
-msgstr "Ne-udeleženci"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
+msgstr "Ta oseba se je že udeleženec sestanka!"
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -4153,6 +4179,7 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4171,7 +4198,7 @@ msgstr "Stanje"
 
 #: 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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -4186,8 +4213,9 @@ msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "_Povabi ostale"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "_Povabi ostale..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
@@ -4197,23 +4225,23 @@ msgstr "_Drug organizator"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -4277,19 +4305,15 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Podatki o sestanku so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "Podatki o nalogi so se spremenili. Pošlji posodobljeno različico?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Dnevniški zapis se je spremenil. Pošlji posodobljeno različico?"
 
@@ -4308,7 +4332,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4320,138 +4344,169 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Datum _pričetka:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Zaupno"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Zbriši izbrane stike"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreži"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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 "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "_Zbriši to opravilo"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datum mora biti vpisan v obliki: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Končano"
 
@@ -4482,8 +4537,8 @@ msgstr "Datum pričetka"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -4495,319 +4550,401 @@ msgstr "Sortiranje opravil"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "_Zbriši ta sestanek"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 #, fuzzy
 msgid "Task begins: <b>"
 msgstr "Nastavitve nalog"
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Čas zaključka sestanka:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Podatki o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Končano "
+
+#: calendar/gui/e-itip-control.c:581
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "Nastavitve nalog"
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "podatki o kodledarju"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Koledar"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Neznana napaka"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Izberi dejanje"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Posodobitev naloge"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "V redu"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Sprejeto"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Poskusno "
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Zavrnjeno"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Podatki o zasedenosti"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Opis:"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 msgid "Free/Busy Information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr "Odgovor na zasedenost"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke"
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Predmeta ni mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 #, fuzzy
 msgid "Attendee status ould not be updated!\n"
 msgstr "Predmeta ni mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Naslov udeleženca"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nisem mogel odstraniti predmeta iz vaše datoteke koledarja!\n"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 #, fuzzy
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4848,193 +4985,215 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Predsedujoči"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Potrebni udeleženci"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Možni udeleženci"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Ne-udeleženci"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individualno"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Soba"
 
-#: 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Stol"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Možni sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Ne-sodelujoči"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Potrebuje dejanje"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "V obdelavi"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Povabi ostale..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Kaži le delavne ure"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Kaži poman_jšano"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Potrebni ljudje"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Čas pričetka sestanka:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Odpiram shrambo %s"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Odpri koledar"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -5091,227 +5250,275 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "so"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Naloga"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Stanje:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioriteta:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Procentov opravljeno"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorije: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Stiki:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape poslov, ki naj se kaže"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
+"in OAF-a."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5319,7 +5526,7 @@ msgstr ""
 "Evolucija je vzela posle, ki so bili v vaši mapi koledarja in jih samodejno "
 "prenesla v novo mapo poslov."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5331,7 +5538,7 @@ msgstr ""
 "Nekaterih poslov ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
 "ponovljen."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5340,7 +5547,7 @@ msgstr ""
 "Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
 "poslov."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5349,83 +5556,83 @@ msgstr ""
 "Metoda potrebna za naložitev `%s' ni podprta; predmeti iz mape koledarja ne "
 "bodo prenešeni v mapo poslov."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "NPTSČPS"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 1 argument"
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5433,11 +5640,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5445,22 +5652,22 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
@@ -5485,7 +5692,7 @@ msgstr "Šifriranje v tem šifrirniku ni podprto"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5496,7 +5703,7 @@ msgstr ""
 "Nadalnje operacije na tem strežniku ne bodo pomnjene, ko se boste\n"
 "znova povezali v mrežo."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5507,94 +5714,94 @@ msgstr ""
 "%s\n"
 "Spremembe storjene v tej mapi ne bodo sinhronizirane."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Sinhroniziram s strežnikom"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Kopiram sporočilo"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5603,7 +5810,7 @@ msgstr ""
 "Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5612,7 +5819,7 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
@@ -5621,197 +5828,197 @@ msgstr "(match-all) zahteva enojen booleanov rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pričakovan niz"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nisem se mogel zakleniti '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Prosim vpišite svoje %s geslo za %s"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpišite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Nisem mogel ustvariti začasne datoteke: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
@@ -5831,7 +6038,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -5841,12 +6048,12 @@ msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena"
@@ -5959,7 +6166,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -5976,8 +6183,8 @@ msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
 #: 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Geslo"
 
@@ -6006,55 +6213,55 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6100,17 +6307,17 @@ msgstr "Nisem uspel dešifrirati sporočila"
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6120,7 +6327,7 @@ msgstr ""
 "Zadeva: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6135,7 +6342,7 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6154,41 +6361,41 @@ msgstr ""
 "Regija/Zvezna država: %s\n"
 "Država: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni takšnega sporočila: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
@@ -6221,57 +6428,57 @@ msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
@@ -6279,7 +6486,7 @@ msgstr "Preverjam za novo pošto"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Mape"
 
@@ -6311,28 +6518,28 @@ msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6343,95 +6550,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Krajevne mape"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Za shranjevanje krajevne pošte v datoteki tipa mbox"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Poštne datoteke tipa Qmail"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Poštni imeniki tipa MH"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Običajnen Unix poštni predal"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Za shranjevanje krajevne pošte v običajnih Unix 'spool' imenikih"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
@@ -6442,23 +6652,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Nisem mogel odpreti povzetka %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Nauspeh ob sporočilu %d"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6467,20 +6682,20 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6489,15 +6704,15 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6506,19 +6721,19 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
@@ -6533,29 +6748,34 @@ msgstr "Nisem mogel prebrati mape `%s': %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Operacija razveljavljena"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki tipa 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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6564,17 +6784,17 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6583,7 +6803,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6592,14 +6812,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6608,108 +6828,116 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Stiku pošlji sporočilo"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
@@ -6719,66 +6947,49 @@ msgstr "`%s' ni imenik."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Datoteka vrste 'spool' s pošto %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Map vrste 'spool' ni možno zbrisati."
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Delam povzetek mape"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Nisem mogel odpreti mape: %s: povzetek delam od položaja %ld dalje: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Ne morem narediti povzetka mape %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nisem mogel uskladiti začasne mape %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisem mogel uskladiti mape vrste 'spool' %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6787,140 +6998,140 @@ msgstr ""
 "Nisem mogel uskladiti mape vrste 'spool' %s: %s\n"
 "Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosim vpišite geslo NNTP za %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Strežnik je zavrnil uporabniško ime"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Sporočilo %s ni bilo najdeno."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s strežnika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET novičke"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Izreži izbrana sporočila"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nisem mogel dobiti sporočila: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Hramba sporočil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Pusti sporočila na strežniku"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6928,7 +7139,7 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
 "večini edina možnost, ki jo strežniki POP podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -6938,34 +7149,34 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s strežnikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpišite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6974,12 +7185,12 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju uporabniškega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6987,7 +7198,7 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6996,197 +7207,197 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Napaka pri pozdravu: %s: morda ni usodna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpišite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7197,172 +7408,172 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na MAIL FROM: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: konec sporočila: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -7394,52 +7605,52 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7452,7 +7663,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7461,29 +7672,29 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7491,16 +7702,16 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7509,7 +7720,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7518,7 +7729,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7527,7 +7738,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7536,7 +7747,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnje seje.\n"
 "Želite poskusiti obnovitev?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7546,28 +7757,39 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Posredovano sporočilo"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Nisem mogel ustvariti okna skladatelja."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
+"identitet v komponenti pošte."
+
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7575,11 +7797,11 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolucija"
 
@@ -7628,15 +7850,24 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -7695,30 +7926,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7858,7 +8089,7 @@ msgstr "Potem"
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7867,16 +8098,16 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
@@ -7893,39 +8124,39 @@ msgstr ""
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "odhodna"
 
@@ -8118,7 +8349,7 @@ msgstr "Odgovorjeno na"
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Pošiljatelj"
 
@@ -8150,7 +8381,7 @@ msgstr "se začne z"
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
@@ -8163,15 +8394,15 @@ msgstr "je bilo po"
 msgid "was before"
 msgstr "je bilo pred"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -8179,48 +8410,48 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Opa. Kot vir morate navesti vsaj eno mapo."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucijina komponenta za obravnavo pošte."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Uvažam"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "se konča z"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Preučujem %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Pošta"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8228,20 +8459,15 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Elm.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Gnome Koledar"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8249,25 +8475,25 @@ msgstr ""
 "Evolucija je našla datoteke GnomeCard-a.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Pregledujem mapo IMAP"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 #, fuzzy
 msgid "Starting import"
 msgstr "Datum _pričetka:"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8275,11 +8501,11 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8287,7 +8513,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Natisni"
@@ -8324,245 +8550,250 @@ msgstr "Tovarna za komponento povzetka pošte."
 msgid "Mail configuration interface"
 msgstr "Vmesnik za nastavitev pošte"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Virtualne mape"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Virtualne mape"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Novo _poštno sporočilo"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d novih"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d skritih"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "Ustvari vMapo iz iskanja"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Označi kot ne_pomembno"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Pošiljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filter glede na dopisni seznam"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Privzeto"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
@@ -8584,18 +8815,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "Telo vsebuje"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "_Kazalo"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Tip poštnega predala"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Nova oblika hranjenja:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8605,15 +8846,15 @@ msgstr ""
 "napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
 " odpravljiva. Prosimo to možnost uprabljajte pazljivo."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8631,18 +8872,18 @@ msgstr "Urejevalnik Evolucijinih novic"
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8652,7 +8893,7 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8668,52 +8909,52 @@ msgstr "Izključi"
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8725,7 +8966,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8733,7 +8974,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8741,23 +8982,23 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Pošlji e-pošto"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8765,18 +9006,18 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke"
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8788,42 +9029,42 @@ msgstr ""
 "To (Očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 #, fuzzy
 msgid "This message contains invalid recipients:"
 msgstr "To sporočilo vsebuje le nepodprte zahtevke"
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Neznana napaka"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8831,7 +9072,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8839,28 +9080,28 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
@@ -8873,12 +9114,12 @@ msgstr ""
 " \n"
 " Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8887,19 +9128,19 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
@@ -8958,16 +9199,16 @@ msgstr ""
 "račun. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Račun"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8978,16 +9219,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Dohdona pošta"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -9005,31 +9246,34 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej različici Evolucije ni podprt)"
 
 #: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Račun"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Računi"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+#, fuzzy
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa vedno podpiši odhodno pošto"
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9041,28 +9285,25 @@ msgid "Authentication"
 msgstr "Avtentifikacija"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Način avtentifikacije: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Preverjam za novo pošto"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "ID certifikata:"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9078,230 +9319,236 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Prikaz"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Mapa osnutkov:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Vključeno"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "Datoteka s podpisom HTML:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Strežnik NNTP"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "ID ključa PGP:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Zapomni si geslo"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Izberi datoteko za dnevnik filtra..."
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Mapa poslanih sporočil:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "Mapa poslanih sporočil:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Strežnik zahteva _avtentifikacijo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Vrsta strežnika:"
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "Strežnik zahteva _avtentifikacijo"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "Uporabi varno povezavo (_SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9311,104 +9558,131 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Always sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa vedno podpiši odhodno pošto"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Način avtentifikacije: "
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto vsakih"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr "_Preveri za podprte tipe"
+#, fuzzy
+msgid "_Certificate ID:"
+msgstr "ID certifikata:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Mapa osnutkov:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "Podpis _HTML:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "Pot do izvršljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Vrsta strežnika:"
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Datoteka s _podpisom:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Vsak"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Opis:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr "držalec mesta"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "sekund."
 
@@ -9448,153 +9722,148 @@ msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "Program GPG/PGP ni nastavljen."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "Šifrirano sporočilo ni prikazano"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "Šifrirano sporočilo"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "Kliknite ikono za dešifriranje."
+#: mail/mail-format.c:1822
+#, fuzzy
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Ne preoznam te vrste komponente koledarja."
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9603,29 +9872,29 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9633,16 +9902,16 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9651,7 +9920,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9660,26 +9929,7 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Vpišite geslo za %s"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Vpišite geslo za %s"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "Delam"
 
@@ -9687,118 +9937,113 @@ msgstr "Delam"
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Ne morem kopirati mape nase."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "Smeti"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9807,7 +10052,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9816,11 +10061,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9829,17 +10074,17 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Odklapljam se od %s"
@@ -9848,97 +10093,107 @@ msgstr "Odklapljam se od %s"
 msgid "_Search"
 msgstr "I_skanje"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporočilo)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Neimenovano sporočilo"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Prazno sporočilo"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Poišči v sporočilu"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Išči naprej"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Poišči"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Vrsta strežnika:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Oddaja in sprejem pošte"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Prekliči"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Vpišite geslo za %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Vpišite geslo za %s"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Odpiram mapo %s"
@@ -9948,7 +10203,7 @@ msgstr "Odpiram mapo %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Odpiram mapo Smeti za %s"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9957,29 +10212,29 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Uredi vMape"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
@@ -10040,7 +10295,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -10066,26 +10321,26 @@ msgstr "Pregledujem mape pod %s na \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
@@ -10125,126 +10380,121 @@ msgstr "_Prekliči naročnino"
 msgid "Evolution component for the executive summary."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Ime:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Nastavitev povzetka"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Napaka ob prenašanju RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "_Viri novic"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "(ni opisa)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Strežnik vremena ni dosegljiv</b></dd>"
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "_Vreme"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Območja"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Natisni povzetek"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Tiskanje povzetka ni uspelo"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
@@ -10302,7 +10552,7 @@ msgstr "Pretežno jasno"
 msgid "Overcast"
 msgstr "Oblačno"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Neveljavno"
 
@@ -10374,1063 +10624,1074 @@ msgstr "severozahod"
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr "Pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr "Pršenje v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr "Rahlo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr "Zmerno pršenje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr "Močno pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr "Plitvo pršenje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr "Ponekod prši"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr "Prši s presledki"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr "Pršenje z vetrom"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr "Pršenje v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr "Zmrzujoče pršenje"
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Dež v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Rahel dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Zmeren dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr "Močan dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr "Plitev dež"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr "Ponekod dežuje"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "Dežuje s presledki"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr "Dež z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 msgid "Drifting rain"
 msgstr "Dež v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 msgid "Freezing rain"
 msgstr "Zmrzujoč dež"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Sneži v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Rahlo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Zmerno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "Močno sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr "Plitvo sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr "Ponekod sneži"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr "Sneži s presledki"
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Snežna nevihta"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr "Sneži z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr "Snežne plohe"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr "Sneži v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr "Zmrzujoče sneži"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sneži v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr "Močno zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sneži"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr "Zrnato sneži s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr "Zrnato sneži z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr "Zrnato sneži v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr "Zmrzujoče zrnato sneži"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr "Močne ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr "Zmrzujoče ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr "Babje pšeno v okolici"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr "Nekaj babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr "Močno babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje pšeno"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr "Babje pšeno s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr "Babje pšeno z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega pšena"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr "Babje pšeno v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr "Zmrzujoče babje pšeno"
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Toča v okolici"
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Rahla toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr "Zmerna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr "Močna toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr "Plitva toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr "Ponekod toča"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 msgid "Partial hail"
 msgstr "Toča s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr "Nevihta toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr "Toča z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr "Ploha toče"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr "Toča v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 msgid "Freezing hail"
 msgstr "Zmrzujoča toča"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr "Močna sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr "Zmrzujoča sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr "Močne padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 msgid "Freezing precipitation"
 msgstr "Zmrzujoče padavine"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr "Zmrzujoče meglice"
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr "Zmrzujoča megla"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr "Dim z grmenjem"
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Piš vetra z grmenjem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr "Vulkanski dim z grmenjem"
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
 msgstr "Plohe vulkanskega dima"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr "Zmrzujoč vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr "Močan pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr "Zmrzujoča suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:115
-msgid "Sprays"
+#: my-evolution/metar.c:352
+#, fuzzy
+msgid "Spray"
 msgstr "Pršec"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
 msgstr "Pršec v okolici"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
 msgstr "Rahel pršec"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
 msgstr "Zmeren pršec"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
 msgstr "Močan pršec"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
 msgstr "Plitev pršec"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+#, fuzzy
+msgid "Patches of spray"
 msgstr "Ponekod pršec"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
 msgstr "Pršec s presledki"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
 msgstr "Pršec z vetrom"
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
 msgstr "Pršec v pasovih"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
 msgstr "Zmrzujoč pršec"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr "Piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr "Piš vetra v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr "Rahel piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr "Zmeren piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr "Močan piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr "Piš vetra s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr "Piš vetra z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr "Nôšen piš vetra"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr "Piš vetra v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr "Zmrzujoč piš vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr "Peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr "Peščeni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr "Rahel peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr "Zmeren peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr "Močan peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr "Plitev peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr "Peščeni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr "Peščeni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr "Nôsen peščeni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr "Peščeni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr "Zmrzujoč peščeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr "Prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr "Prašni vihar v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr "Rahel prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr "Zmeren prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr "Močan prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr "Plitev prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr "Prašni vihar s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr "Prašni vihar z grmenjem"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr "Nôsen prašni vihar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr "Prašni vihar v pasovih"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr "Zmrzujoč prašni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr "Zmrzujoč tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr "Prašni vrtinec"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr "Prašni vrtinci v okolici"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr "Rahli prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr "Zmerni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr "Močni prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr "Plitvi prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr "Ponekod prašni vrtinci"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr "Prašni vrtinci s presledki"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr "Prašni vrtinci z vetrom"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr "Prašni vrtinci v pasovih"
 
@@ -11439,7 +11700,8 @@ msgid " _Remove"
 msgstr " _Odstrani"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+#, fuzzy
+msgid "Add n_ews feed"
 msgstr "Dodaj _nov vir novic"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11454,14 +11716,13 @@ msgstr "Vse _mape:"
 msgid "All news _feeds:"
 msgstr "Vsi viri _novic:"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "Koliko dni naj koledar pokaže hkrati?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "M_etric"
-msgstr "_metrični"
+msgid "How many days should the calendar display at once?"
+msgstr "Koliko dni naj koledar pokaže hkrati?"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
@@ -11502,12 +11763,12 @@ msgid "Show _today's tasks"
 msgstr "Kaži _današnje naloge"
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "Naloge "
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr "Enote: "
+msgid "Tasks "
+msgstr "Naloge "
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
@@ -11526,13 +11787,12 @@ msgid "_Displayed feeds:"
 msgstr "_Kaži novice:"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
-msgstr "_pet dni"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "_Imperial"
-msgstr "_imperijski"
+msgid "_Five days"
+msgstr "_pet dni"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -11566,23 +11826,23 @@ msgstr "Kaži podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Dohodna pošta"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11590,16 +11850,16 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11610,7 +11870,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11620,7 +11880,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11631,7 +11891,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11645,7 +11905,7 @@ msgstr ""
 "lahko Evolucija požene.\n"
 "Želite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11656,6 +11916,19 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolucija"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ne morem prestaviti mape nase."
@@ -11668,25 +11941,25 @@ msgstr "Ne morem kopirati mape nase."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11695,18 +11968,18 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Zbriši"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Ste prepričani, da želite zbrisati mapo '%s'?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11715,16 +11988,22 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Odstrani izbrano mapo"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Preimenuj mapo '%s'"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Izbrano ime mape ni veljavno."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11734,34 +12013,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Prejemniki niso navedeni"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Izbrano ime mape ni veljavno."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11769,19 +12025,19 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11795,13 +12051,13 @@ msgstr ""
 "Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11812,7 +12068,7 @@ msgstr ""
 "Uvoznik ni pripravljen.\n"
 "Čakam 5 sekund na nov poskus."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11821,16 +12077,16 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Mapa `%s' ne obstaja."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11839,11 +12095,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11852,17 +12108,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11871,139 +12127,146 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Od:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Ne morem inicializirati lupine Evolucije: %s"
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Ne morem inicializirati lupine Evolucije: %s"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Prejemniki niso navedeni"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Ta mapa ne more vsebovati sporočil."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolucija"
-
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolucija je zbirka programov okolja \n"
-"GNOME za delo v skupinah, za pošto, koledar in \n"
-"urejanje stikov."
+msgid "About Ximian Evolution"
+msgstr "_O Evoluciji..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
 msgstr "Delaj na mreži"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "_Delaj brez mreže"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
@@ -12011,50 +12274,40 @@ msgstr "Delaj brez mreže"
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolucija je trenutno na mereži.  Kliknite na ta gumb za delo brez mreže."
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolucija je v procesu odklapljanja z mreže."
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12062,35 +12315,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "V redu"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12099,113 +12348,113 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Preimenuj"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Odstrani"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12214,65 +12463,171 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "V/I napaka"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "Neveljavni argumenti"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Nikomur"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Vizitka ni bila najdena"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr "_Preveri za podprte tipe"
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Uporabnik je dejanje preklical."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "Drugačna napaka"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "obstaja"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Neveljavno"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Ni takšne mape %s"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Izbrano ni nilo nobeno sporočilo"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Neznana napaka"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Aktivne povezave"
@@ -12374,87 +12729,70 @@ msgstr ""
 "S tem druidom boste vodeni skozi proces uvoza\n"
 "zunanjih datotek v Evolucijo."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Uvozniki"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Nastavive Moje Evolucije..."
 
-#: shell/main.c:162
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
-"programja za delovne skupine Evolucija.\n"
-"\n"
-"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
-"deluje le polovično.\n"
-"\n"
-"Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
-"Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
-"osebe, ki doživljajo nasilne napade jeze.\n"
-"\n"
-"Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
-"pričakujemo vaše prispevke!\n"
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Hvala,\n"
-"skupina Evolucije\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Evolucije: %s"
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Napaka ob nalaganju datoteke %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Odpri datoteko"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Vstavi datoteko"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Prejemniki niso navedeni"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12546,7 +12884,7 @@ msgstr "Ustavi nalaganje"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "_Dejanja"
@@ -12569,7 +12907,7 @@ msgid "_Forward Contact..."
 msgstr "_Stiki..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Na_tisni..."
@@ -12618,7 +12956,7 @@ msgstr "Dan"
 msgid "Delete the appointment"
 msgstr "Zbriši ta sestanek"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Pojdi na"
 
@@ -12744,11 +13082,12 @@ msgstr "Natisni..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Shrani"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
@@ -12765,7 +13104,7 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datoteka"
@@ -12787,7 +13126,7 @@ msgstr "Shrani stik in zapri dialog"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Shrani"
 
@@ -12847,10 +13186,6 @@ msgstr "Načrtuj sestanek za ta predmet"
 msgid "Customise My Evolution"
 msgstr "Prikroji Mojo Evolucijo"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Prekliči"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Prekliči trenutno operacijo pošte"
@@ -13106,281 +13441,312 @@ msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 msgid "Create a virtual folder for this subject"
 msgstr "Ustvari navidezno mapo za ta predmet"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Kaži naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Kaži naslednjo neprebrano nit"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Kaži prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_oštni seznam..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v HTML pošti naložene"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Posreduj naprej kot"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Posreduj _pripeto"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Posreduj kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Posreduj kot _citirano"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduj izbrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Vstavi datoteko z besedilom..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Naslednja nit"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "_Išči v sporočilu"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "S_maller"
+msgstr "_Povzetek"
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Pozivnik"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Orodja"
@@ -13391,7 +13757,7 @@ msgstr "Zapri to okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Zapri"
@@ -13422,11 +13788,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
+#, fuzzy
+msgid "For_mat"
+msgstr "Oblika izpisa"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13474,7 +13842,7 @@ msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
@@ -13567,7 +13935,7 @@ msgid "_From Field"
 msgstr "Polje _od"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vstavi"
 
@@ -13583,7 +13951,7 @@ msgstr "Polje o_dgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -13830,10 +14198,6 @@ msgstr "_Bližnjica"
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "_Delaj brez mreže"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Spremeni nastavitve povzetka"
@@ -13908,132 +14272,136 @@ msgstr ""
 "pasu.\n"
 " Uporabite desni miškin gumb za pomanjšavo."
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Določi poglede"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Sedaj"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Danes"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltski"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Srednjeevropski"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Kitajski"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirilični"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grški"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonski"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Korejski"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Turški"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Zahodnoevropski"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Tradicionalen"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Poenostavljen"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Nov"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznan nabor znakov: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Vpišite nabor znakov, ki naj se uporablja"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Drugo..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Nabor znakov"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Dodaj med shranjena iskanja"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Kaži vse"
 
@@ -14076,18 +14444,182 @@ msgstr "Strežnik osebnega adresarja"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se začne ob %s in konča ob %s"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se začne ob %s"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Obvestilo o vašem sestanku, ki se konča ob %s"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Obvestilo o vašem sestanku"
+
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "Obvestilo o vašem opravilu, ki se konča ob %s in konča ob %s"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Obvestilo o vašem opravilu, ki se začne ob %s"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Obvestilo o vašem opravilu, ki se konča ob %s"
+
+#~ msgid "Notification about your task"
+#~ msgstr "Obvestilo o vašem opravilu"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarm na %A %d %b %Y ob %H:%M"
+
+#~ msgid "_Invite Others"
+#~ msgstr "_Povabi ostale"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Zaupno"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Opis:"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Poštne datoteke tipa Qmail"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Delam povzetek mape"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti mape: %s: povzetek delam od položaja %ld dalje: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Ne morem narediti povzetka mape %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Nisem mogel ustvariti okna skladatelja."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Gnome Koledar"
+
+#~ msgid "Always encrypt to myself when sending encrypyed mail"
+#~ msgstr "Kadar pošiljam šifrirano pošto, vedno šifriraj sebi"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Program GPG/PGP ni nastavljen."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Šifrirano sporočilo ni prikazano"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Šifrirano sporočilo"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Kliknite ikono za dešifriranje."
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Ne morem kopirati mape nase."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#~ msgid "Smoke w/ thunders"
+#~ msgstr "Dim z grmenjem"
+
+#~ msgid "Volcanic ash w/ thunders"
+#~ msgstr "Vulkanski dim z grmenjem"
+
+#, fuzzy
+#~ msgid "M_etric"
+#~ msgstr "_metrični"
+
+#~ msgid "Units: "
+#~ msgstr "Enote: "
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "_imperijski"
+
+#, fuzzy
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolucija"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolucija je zbirka programov okolja \n"
+#~ "GNOME za delo v skupinah, za pošto, koledar in \n"
+#~ "urejanje stikov."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolucija %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolucija %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
+#~ "programja za delovne skupine Evolucija.\n"
+#~ "\n"
+#~ "Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka "
+#~ "ali\n"
+#~ "deluje le polovično.\n"
+#~ "\n"
+#~ "Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
+#~ "Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
+#~ "osebe, ki doživljajo nasilne napade jeze.\n"
+#~ "\n"
+#~ "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
+#~ "pričakujemo vaše prispevke!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Hvala,\n"
+#~ "skupina Evolucije\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "O_blikuj izpis"
+
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Prosim vpišite naslov svoje e-pošte in geslo za %s"
 
@@ -14308,9 +14840,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d/%m/%Y"
 
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
@@ -14323,9 +14852,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Pine mail"
 #~ msgstr "Poštni program Pine"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Tovarna za Evolucijino komponento pošte."
-
 #~ msgid "On %s, %s wrote:"
 #~ msgstr "Na %s, je %s zapisal(a):"
 
@@ -14433,9 +14959,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Using the _Mailer"
 #~ msgstr "Uporaba _pošte"
 
-#~ msgid "_Index"
-#~ msgstr "_Kazalo"
-
 #~ msgid "All Attendees"
 #~ msgstr "Vsi udeleženi"
 
@@ -14528,9 +15051,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Notification about your journal entry"
 #~ msgstr "Obvestilo o vašem dnevniškem vpisu"
 
-#~ msgid "Open calendar"
-#~ msgstr "Odpri koledar"
-
 #~ msgid "Save calendar"
 #~ msgstr "Shrani koledar"
 
@@ -14574,15 +15094,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "minutes before they occur."
 #~ msgstr "minut preden se zgodijo."
 
-#~ msgid "No one"
-#~ msgstr "Nikomur"
-
-#~ msgid "Task"
-#~ msgstr "Naloga"
-
-#~ msgid "Percent complete"
-#~ msgstr "Procentov opravljeno"
-
 #~ msgid "Transparency"
 #~ msgstr "Prosojnost"
 
@@ -14890,15 +15401,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Component successfully deleted."
 #~ msgstr "Komponenta uspešno zbrisana."
 
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "Ne preoznam te vrste komponente koledarja."
-
 #~ msgid "Add to Calendar"
 #~ msgstr "Dodaj _koledarju"
 
-#~ msgid " Tentative "
-#~ msgstr " Poskusno "
-
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
@@ -15993,9 +16498,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Undo"
 #~ msgstr "_Razveljavi"
 
-#~ msgid "S_ummary"
-#~ msgstr "_Povzetek"
-
 #~ msgid "task-editor-dialog"
 #~ msgstr "dialog-urejevalnik-dogodkov"
 
@@ -16680,9 +17182,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label27"
 #~ msgstr "oznaka27"
 
-#~ msgid "Ending date"
-#~ msgstr "Datum zaključka"
-
 #~ msgid "Add to-do item..."
 #~ msgstr "Dodaj opravilo..."
 
diff --git a/po/sv.po b/po/sv.po
index b601d34b95..93c5831aea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,12 @@
 # Christian Rose <menthos@menthos.com>, 2000, 2001.
 # Martin Norb�ck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.129 2001/10/31 11:36:43 menthos Exp $
+# $Id: sv.po,v 1.130 2001/10/31 23:07:29 ettore Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-10-31 12:35+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-31 12:30+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2919,6 +2919,11 @@ msgstr "Skriv ut kort"
 msgid "Print envelope"
 msgstr "Skriv ut kuvert"
 
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "_Redigera m�te"
+
 #: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
@@ -3309,23 +3314,23 @@ msgstr "Ny _uppgift"
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Alternativ f�r ljudalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Alternativ f�r meddelandealarm"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Alternativ f�r e-postalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Alternativ f�r programalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Alternativ f�r ok�nda alarm"
 
@@ -4209,7 +4214,7 @@ msgid "Progress"
 msgstr "F�rlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4414,7 +4419,7 @@ msgstr "Startdatum"
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -5037,17 +5042,17 @@ msgstr "Metoden som kr�vs f�r att l�sa in \"%s\" st�ds inte"
 msgid "New _Appointment..."
 msgstr "Nytt _m�te..."
 
-#: calendar/gui/gnome-cal.c:1489
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte �ppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1500
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som kr�vs f�r att �ppna \"%s\" st�ds inte"
 
-#: calendar/gui/gnome-cal.c:1855
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�ppnar kalender i %s"
@@ -9573,51 +9578,51 @@ msgstr "Kopia"
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1799
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Detta meddelande �r digitalt signerat. Klicka p� l�sikonen f�r mer "
 "information."
 
-#: mail/mail-format.c:1823
+#: mail/mail-format.c:1822
 msgid "Evolution does not recognize this type of signed message."
 msgstr "Evolution k�nner inte igen denna typ av signerat meddelande."
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Detta meddelande �r digitalt signerat och har befunnits �kta."
 
-#: mail/mail-format.c:1839
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Detta meddelande �r digitalt signerat men �ktheten kan inte bevisas."
 
-#: mail/mail-format.c:2055
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig p� platsen \"%s\""
 
-#: mail/mail-format.c:2074
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2103
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fj�rrdata (%s)"
 
-#: mail/mail-format.c:2111
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till ok�nd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -10168,29 +10173,39 @@ msgstr "%l.%M %d %B"
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-preferences.c:423
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr "ESGG:ESMS:ESSA:ESNU"
+
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord fr�n dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta �r inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:925
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "L�gg till en nyhetsk�lla"
 
 # Detta �r inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:933
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den nyhetsk�lla som du vill l�gga till"
 
-#: my-evolution/e-summary-preferences.c:937
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1483
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Sammanfattningsinst�llningar"
 
@@ -10223,14 +10238,6 @@ msgstr "<dd><b>V�derservern kunde inte kontaktas</b></dd>"
 msgid "Weather"
 msgstr "V�der"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS"
-msgstr "ESGG:ESMS:ESSA:ESNU"
-
 #: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regioner"
@@ -11936,6 +11943,23 @@ msgstr ""
 "V�lj den information som\n"
 "du vill importera"
 
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Inget mappnamn �r angivet."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Mappnamnet kan inte inneh�lla Retur-tecknet."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Denna mapp kan inte inneh�lla meddelanden."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "\".\" och \"..\" �r reserverade mappnamn."
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
@@ -14144,18 +14168,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "KBOS:EGAA:RJTT"
 #~ msgstr "ESGG:ESMS:ESSA:ESNU"
 
-#~ msgid "No folder name specified."
-#~ msgstr "Inget mappnamn �r angivet."
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "Mappnamnet kan inte inneh�lla Retur-tecknet."
-
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "Mappen kan inte inneh�lla katalogavskiljaren."
 
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "\".\" och \"..\" �r reserverade mappnamn."
-
 #~ msgid ""
 #~ "Hi.  Thanks for taking the time to download this preview release\n"
 #~ "of the Ximian Evolution groupware suite.\n"
diff --git a/po/tr.po b/po/tr.po
index 2bb30cea9c..7df88e8c50 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-07-07 09:25+0200\n"
 "Last-Translator: G�rkem �etin <gorkem@gelecek.com.tr>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -12,6 +12,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "VCard dosyalar�n� Evolution'a aktar�m mimarisi."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "VCard dosyalar�n� Evolution'a aktar�r."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "VCard dosyalar�n� Evolution'a aktar�m mimarisi."
@@ -20,308 +30,313 @@ msgstr "VCard dosyalar�n� Evolution'a aktar�m mimarisi."
 msgid "Imports VCard files into Evolution."
 msgstr "VCard dosyalar�n� Evolution'a aktar�r."
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Farkl� Dosyala"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "�sim"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "�lk"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "�lk"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Yard�mc�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Me�gul"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Geri Arama"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "�irket"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Kopyala"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Kurum: "
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Cep"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Araba"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "��yeri Faks�"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "��yeri Faks�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Ev Faks�"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "2. Meslek"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Me�gul"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "2. ev"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Di�er"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Ba�ka Fakslar"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�a�r� Cihaz�"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Radyo"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 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
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "2. E-posta Adresi"
 
-#: 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
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Web Sayfas�"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "B�l�m"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "Ofis"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "S�fat"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Uzmanl�k alan�"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Y�netici"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "May�s"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "Lakap"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "E�"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Takvim"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Web Sayfas�"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 #, fuzzy
 msgid "Anniversary"
 msgstr "_Y�ld�n�m�:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:101
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Do�um G�n�: "
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:105
 #, fuzzy
 msgid "Family Name"
 msgstr "Tam �sim"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -329,7 +344,7 @@ msgstr ""
 "\n"
 "�sim: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -337,7 +352,7 @@ msgstr ""
 "\n"
 "  �nek:     "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -345,7 +360,7 @@ msgstr ""
 "\n"
 "  Verilen:      "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "  Ek: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "  Aile:     "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -369,7 +384,7 @@ msgstr ""
 "\n"
 "  Sonek:     "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -377,7 +392,7 @@ msgstr ""
 "\n"
 "Do�um G�n�: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -385,7 +400,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -393,7 +408,7 @@ msgstr ""
 "\n"
 "  Posta Kutusu:  "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -401,7 +416,7 @@ msgstr ""
 "\n"
 "  Di�er:         "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -409,7 +424,7 @@ msgstr ""
 "\n"
 "  Cadde:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -417,7 +432,7 @@ msgstr ""
 "\n"
 "  �ehir:        "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -425,7 +440,7 @@ msgstr ""
 "\n"
 "  B�lge:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -433,7 +448,7 @@ msgstr ""
 "\n"
 "  Posta Kodu: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -441,13 +456,13 @@ msgstr ""
 "\n"
 "  �lke:     "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -455,7 +470,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -463,7 +478,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -471,7 +486,7 @@ msgstr ""
 "\n"
 "E-posta:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -479,7 +494,7 @@ msgstr ""
 "\n"
 "E-posta:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -487,7 +502,7 @@ msgstr ""
 "\n"
 "Postalay�c�: "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -495,7 +510,7 @@ msgstr ""
 "\n"
 "Zaman Dilimi: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -503,7 +518,7 @@ msgstr ""
 "\n"
 "Co�rafi Konum: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -511,7 +526,7 @@ msgstr ""
 "\n"
 "Meslek: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -519,7 +534,7 @@ msgstr ""
 "\n"
 "Kurum: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -527,7 +542,7 @@ msgstr ""
 "\n"
 "  �sim:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -535,7 +550,7 @@ msgstr ""
 "\n"
 "  �nite:  "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -543,7 +558,7 @@ msgstr ""
 "\n"
 "  �nite2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -551,7 +566,7 @@ msgstr ""
 "\n"
 "  �nite3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -559,7 +574,7 @@ msgstr ""
 "\n"
 "  �nite5: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -567,7 +582,7 @@ msgstr ""
 "\n"
 "S�n�flar: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -585,7 +600,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -593,7 +608,7 @@ msgstr ""
 "\n"
 "�zel Dizi: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -601,11 +616,11 @@ msgstr ""
 "\n"
 "A��k Anahtar: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "�oklu VCard"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "%s i�in VCard"
@@ -614,39 +629,41 @@ msgstr "%s i�in 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:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu ba�latamad�m"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "Ayarlar..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "Bekleniyor..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Arama deyimi �al��t�r�lamad�: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr "Sunucuya ba�lant� kuruluyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr ""
@@ -654,55 +671,55 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr "Sunucuya ba�lant� kuruluyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Sunucuya ba�lant� kuruluyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Kartlar siliniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "�mle� y�klenemedi\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook y�klenmedi\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "wombat sunucusu ba�lat�lamad�"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Wombat ba�lat�lamad�"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamad�"
 
@@ -746,49 +763,49 @@ msgstr "Adres defteri men�s� mimarisi"
 msgid "Factory for the sample Addressbook control"
 msgstr "�rnek adres defteri kontrol mimarisi"
 
-#: 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
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "_Ba�lant�"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Filtre bilgisini y�klerken hata olu�tu:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP Sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Filtre bilgisini y�klerken hata olu�tu:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Yeni Ba�lant�:"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "Yeni Ba�lant�:"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "Yeni Ba�lant�:"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Yeni Ba�lant�:"
@@ -824,7 +841,7 @@ msgid "Base"
 msgstr "Temel"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "Temel"
@@ -910,16 +927,16 @@ msgstr "Hesap Y�neticisi"
 #: 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:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "_Ekle"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_D�zenle"
@@ -939,15 +956,20 @@ msgstr "Port:"
 msgid "_Server name:"
 msgstr "Sunucu Mesaj�:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "Gnome-vfs ba�lat�lam�yor"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 msgid "Other Contacts"
 msgstr "Di�er Ba�lant�lar"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Adres defterini a�amad�m"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -956,7 +978,7 @@ msgstr ""
 "Bu adres defteri a��lamad�. Hatal� bir adres girilmi�,\n"
 "ya da LDAP sunucusu eri�ilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -968,7 +990,7 @@ msgstr ""
 "program� CVS kaynaklar�ndan alaca��n�z openLDAP deste�i\n"
 "ile kurmal�s�n�z:\n"
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -976,44 +998,44 @@ msgstr ""
 "Bu adres defteri a��lamad�. Yeterli izin haklar�na sahip olup\n"
 "olmad���n�z� ve dosyan�n yerini kontrol edin."
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s i�in parolay� girin"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Herhangi bir alan�n i�eri�i"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "�sim i�eri�i"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-posta i�eri�i"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kategoriler"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Geli�mi�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kategori:"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin taray�c�s�n�n g�sterece�i URI"
 
@@ -1026,51 +1048,51 @@ msgstr "Dizin taray�c�s�n�n g�sterece�i URI"
 msgid "(none)"
 msgstr "(hi�biri)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Birincil E-posta Adresi"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Bir Eylem Se�in"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Yeni bir ba�lant� yarat: \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "\"%s\" ba�lant�s�na adres ekle"
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Adres Defterini Ara�t�r�l�yor..."
 
-#: 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:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Ba�lant� Bilgisini D�zenle"
 
-#: 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:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Ba�lant�lara Ekle"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "E-posta Adresini Birle�tir"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Aramalar� Kapat"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aramalar� Etkinle�tir (Tehlikeli!)"
 
@@ -1082,51 +1104,60 @@ msgstr "Evolution adres defteri isim se�me aray�z�."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres defteri isim se�im aray�z� mimarisi"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "T�m�n� Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "HTML Posta G�nderilsin mi?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "_Ba�lant�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "De�i�tirilen Ba�lant�:"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "De�i�tirilen Ba�lant�:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 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."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1191,12 +1222,12 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "�leti�im D�zenleyici"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Ayr�nt�lar"
 
@@ -1266,9 +1297,9 @@ msgstr "_Ba�lant�lar..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Sil"
@@ -1338,37 +1369,47 @@ msgstr "Ger�ekten bu hesab� silmek istiyor musunuz?"
 msgid "Delete Contact?"
 msgstr "Ba�lant�y� Sil?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Bu ba�lant� ad� a�a��daki s�n�fland�rmalara girer:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "`%s' dizin �zet dosyas� silinemedi: %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Ba�lant�y� H�zl� Ekle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "T�m�n� D�zenle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Tam �sim"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-posta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Sisli"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2506,7 +2547,7 @@ msgid "contact-list-editor"
 msgstr "�leti�im D�zenleyici"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "�leti�im D�zenleyici"
@@ -2557,162 +2598,169 @@ msgstr ""
 "De�i�tirilen ba�lant� adresinin ad� ya da e-posta adresi zaten var.\n"
 "Yine de eklemek istiyor musunuz?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Geli�mi� Arama"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Ara"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "Ba�lamad�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Takvimi yazd�r"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d saniye"
 
-#: 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:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "A�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "_Eklentiyle Y�nlendir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Ba�lant�ya ileti g�nder"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Yazd�r"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Zarf� Yazd�r"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kartlar d�zenlenirken bir hata olu�tu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 #, fuzzy
 msgid "Success"
 msgstr "Kaynaklar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "�evrimd��� �al��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "�zin yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "Dosya bulunamad�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "��lem desteklenmiyor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "�ptal Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "G/� hatas�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "De�i�iklikleri kaydetmek istiyor musunuz?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s y�klenirken hata olu�tu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "Kartlar d�zenlenirken bir hata olu�tu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Kartlar d�zenlenirken bir hata olu�tu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "Kart� silerken bir hata olu�tu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Kart� silerken bir hata olu�tu"
 
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2720,75 +2768,84 @@ msgstr ""
 #. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Ba�lant� eklemek buraya t�klay�n *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "�lk Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Sekreter Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "�� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Geri Arama Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "�irket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "��yeri Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Ara� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "2. �� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "2. Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Di�er Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Di�er Adres"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "Adres Defterine kaydet"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2976,98 +3033,113 @@ msgstr "Geni�lik:"
 msgid "_Font..."
 msgstr "Yaz�tipi..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Takvimi yazd�r"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Takvimi yazd�r"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Zarf� Yazd�r"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Toplant�y� d�zenle"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Y�ksek"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "D���k"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Tan�ms�z"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Takvim sunucusuyla ileti�imde hata olu�tu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama blo�u okunamad�"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama blo�u okunamad�"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Takvim g�steren �rnek bir Bonobo denetleyici."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Takvim g�steren �rnek bir Bonobo denetleyici."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution takvim �zet bile�eni."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution takvimi iTip/iMip g�r�nt�leyici"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Takvimi d�zenleyen Evolution bile�eni."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Takvim �zet bile�en mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Evolution e-posta bile�en mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Takvim iTip g�r�nt� kontrol� mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "�rnek Takvim kontrol� mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Evolution takvimi bile�en mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolution takvimi bile�en mimarisi."
@@ -3080,47 +3152,29 @@ msgstr "Alarm bilgilendirme servisi"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm bilgilendirme servisi mimarisi"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Randevu i�in uyar�: Ba�lang�� tarihi %s, biti� tarihi %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "%s tarihinde ba�layacak randevu i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "%s tarihinde bitecek randevu i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-msgid "Notification about your appointment"
-msgstr "Randevu uyar�s�"
-
-#: 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 tarihinde ba�layacak ve %s tarihinde bitecek g�rev i�in uyar�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Ayarlar"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
-msgstr "%s tarihinde ba�layacak g�rev i�in uyar�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr "%s tarihinde bitecek g�rev i�in uyar�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "B_iti� tarihi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-msgid "Notification about your task"
-msgstr "G�rev uyar�s�"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%d %b %A, %Y %H:%M tarihinde alarm ver"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Uyar�lar"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3141,12 +3195,12 @@ msgstr "Dinlenme zaman� (dakika)"
 msgid "_Edit appointment"
 msgstr "Toplant�y� d�zenle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 #, fuzzy
 msgid "No description available."
 msgstr "�zet yok."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3154,7 +3208,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3165,38 +3219,39 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOME ba�lat�lam�yor"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Gnome-vfs ba�lat�lam�yor"
+#: calendar/gui/alarm-notify/notify-main.c:181
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Alarm bilgilendirme servis mimarisi olu�turamad�m"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi olu�turamad�m"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%d %B %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%d %B %A"
@@ -3204,100 +3259,78 @@ msgstr "%d %B %A"
 #. 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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Takvim g�r�n�m� yarat�lamad�. ORBit ve OAF kurulumunu g�zden ge�irin."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "�zel"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Genel"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "hafta"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Me�gul"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Ba�lamad�"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "��lemde"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Tamamland�"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: 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 "%d/%m/%Y %a %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: 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:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"G�n, a�a��daki bi�imde girilmelidir: \n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3307,53 +3340,56 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Y�zde de�eri 0 ile 100 aras�nda bulunmal�d�r."
-
 #. 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:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: 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
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "G�revlendirildi"
 
-#: 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
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Hay�r"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Ayarlar..."
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "G�n G�r�n�m�"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "�al��ma Haftas� G�r�n�m�"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Hafta G�r�n�m�"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Ay G�r�n�m�"
 
@@ -3369,12 +3405,12 @@ msgstr "A��klama i�eri�i"
 msgid "Comment contains"
 msgstr "Yorum i�eri�i"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -3382,9 +3418,9 @@ msgstr "Takvim"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "G�revler"
@@ -3394,26 +3430,26 @@ msgstr "G�revler"
 msgid "Folder containing to-do items"
 msgstr "E-posta Listesi �zerinde VFolder"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Yeni bir randevu yarat"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Yeni Randevu"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Yeni bir g�rev yarat"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Yeni G�rev"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Takvimin g�sterecek oldu�u URI"
 
@@ -3489,48 +3525,48 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 saniye"
 
@@ -3589,17 +3625,12 @@ msgstr " randevunun bitiminden sonra"
 msgid "%s at the end of the appointment"
 msgstr " randevunun bitiminden sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, fuzzy, c-format
-msgid "%s at an unknown time"
-msgstr "Bilinmeyen hata"
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s sunucu %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3620,7 +3651,7 @@ msgstr "Hat�rlat�c�lar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�zet:"
 
@@ -3651,7 +3682,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -3708,7 +3739,7 @@ msgid "First day of wee_k:"
 msgstr "Haftan�n ilk g�n�:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Cuma"
 
@@ -3723,7 +3754,7 @@ msgid "Minutes"
 msgstr "dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -3733,7 +3764,7 @@ msgid "O_verdue tasks:"
 msgstr "Zaman� ge�en g�revler"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -3758,7 +3789,7 @@ msgid "Su_n"
 msgstr "Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -3778,7 +3809,7 @@ msgid "Tas_ks due today:"
 msgstr "Bug�n�n i�leri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Per�embe"
 
@@ -3801,12 +3832,12 @@ msgid "Time format:"
 msgstr "Zaman bi�imi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Sal�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "�ar�amba"
 
@@ -3889,123 +3920,128 @@ msgstr "�ar"
 msgid "before the start of the appointment"
 msgstr " randevunun ba�lang�c�ndan �nce"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ger�ekten bu hesab� silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ger�ekten %d g�revi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "`%s' ba�l�ks�z g�nl�k girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 #, fuzzy
 msgid "This task has been deleted."
 msgstr "Bu bir toplant� iste�idir."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Bu bir olay iptalidir."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Tarihe g�re "
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Dosyalar d�zg�n bir �ekilde g�ncellenemedi"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "Toplant�y� d�zenle"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:681
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Randevular"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:684
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "G�revler"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:701
 #, fuzzy
 msgid "No summary"
 msgstr "�leti �zeti"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Dosya �zerine yaz�ls�n m�?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4013,53 +4049,53 @@ msgstr ""
 "Ayn� isimde bir dosya zaten var\n"
 "�zerine yaz�ls�n m�?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Farkl� Kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ger�ekten '%s' randevusunu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ger�ekten bu randevuyu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ger�ekten %s g�revini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ger�ekten bu g�revi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "`%s' ba�l�ks�z g�nl�k girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu ba�l�ks�z g�nl�k girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ger�ekten %d randevuyu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ger�ekten %d g�revi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ger�ekten %d g�nl�k girdisini silmek istiyor musunuz?"
@@ -4079,26 +4115,26 @@ msgstr "G�revi Da��t"
 msgid "Enter Delegate"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Hat�rlat�c�"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Toplant� Zaman� D�zenle"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Toplant�"
 
@@ -4118,12 +4154,13 @@ msgid "Classification"
 msgstr "S�n�fland�rma"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Gizli"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Tarih & Zaman"
 
@@ -4133,12 +4170,12 @@ msgid "F_ree"
 msgstr "hafta"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "�_zel"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Genel"
 
@@ -4149,7 +4186,7 @@ msgid "Show Time As"
 msgstr "G�ster"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "�_zet:"
 
@@ -4161,35 +4198,19 @@ msgstr "B_iti� tarihi:"
 msgid "_Start time:"
 msgstr "B_a�lang�� tarihi:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Ara� Telefonu"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "�stenen Bilgiler"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Se�imlik Bilgiler"
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "At least one attendee is required."
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Sil..."
@@ -4237,6 +4258,7 @@ msgid "Member"
 msgstr "Eyl�l"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4256,7 +4278,7 @@ msgstr "Durum"
 
 #: 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:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T�r"
@@ -4272,8 +4294,8 @@ msgid "_Change Organizer"
 msgstr "Kurum:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "_Invite Others"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
 msgstr "_Ba�kalar�n� Davet Et..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4285,23 +4307,23 @@ msgstr "Kurum:"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu randevuyu Evolution d�zenleyemiyor."
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "g�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "tekrarlar"
 
@@ -4370,19 +4392,15 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "y�l"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "De�i�iklikleri kaydetmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4401,7 +4419,7 @@ msgid "Progress"
 msgstr "��lem"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4413,144 +4431,175 @@ msgstr "�_ncelik:"
 msgid "_Status:"
 msgstr "_Durum:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "G�revlendirildi"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "A��klama:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "_Ba�lang�� Tarihi:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "_Gizli"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Tarihe G�re:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Se�ili ba�lant�lar� sil"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "_A�"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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 "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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��t�r"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Bitmi� olarak i�aretle"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Bu g�revi sil"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "G�revleri bitmi� olarak i�aretle"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Se�ilen g�revleri sil"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "G�rev eklemek buraya t�klay�n"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %a %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"G�n, a�a��daki bi�imde girilmelidir: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Uyar�lar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Tamamland�"
 
@@ -4581,8 +4630,8 @@ msgstr "Ba�lang�� Tarihi"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "�zet"
 
@@ -4595,339 +4644,420 @@ msgstr "G�rev Listesi"
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i dakika b�lmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%d %B %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "��"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "�s"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Y_eni T�m G�n Olay�"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "_Bug�ne Git"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Tarihe Git..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Bu Randevuyu Sil"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Olu�umu Ta��nabilir Yap"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Bu Olu�umu Sil"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "T�m Olu�umlar� Sil"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "�stenen Bilgiler"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Toplant� _biti� saati:"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "�stenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Tamamlanan "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "takvim bilgisi"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Takvim"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Bilinmeyen hata"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 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>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Bir Eylem Se�in"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "daha �nce"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "Tamam"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Hesap"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Giri�imli"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Silinen"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "�stenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "A��klama:"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Bilgi"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "�ptal"
+
+#: calendar/gui/e-itip-control.c:867
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Son toplant� bilgisini al"
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Se�imlik Bilgiler"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Toplant�"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Toplant� _biti� saati:"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Son toplant� bilgisini al"
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Bu, bir toplant� iste�ine cevapt�r."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Toplant�"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Bir Eylem Se�in"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "�letide Bul"
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Bilgi"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "daha �nce"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Bu, son g�rev bilgisi i�in bir istektir."
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Bu, bir toplant� iste�ine cevapt�r."
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Cevapla"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Bu bir g�rev iptalidir."
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Takvim Mesaj�"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "�stenen Bilgiler"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "�stenen Bilgiler"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Bu, son g�rev bilgisi i�in bir istektir."
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Web Sayfas�"
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Bu, bir toplant� iste�ine cevapt�r."
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Web Sayfas�"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "�letiyi Yazd�r"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr "Bu iletinin bi�imi d�zg�n de�il."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�mle� y�klenemedi\n"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Tamamlama Tarihi:"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Bu ��e takvim dosyas�ndan silinemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "_Biten %:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "G�nderilme tarihi"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4968,88 +5098,107 @@ msgstr "biti�-tarihi"
 msgid "date-start"
 msgstr "ba�lang��-tarihi"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Ara� Telefonu"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "�stenen Bilgiler"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Se�imlik Bilgiler"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 #, fuzzy
 msgid "Group"
 msgstr "Grup ad�:"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Ka��t kayna��:"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 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:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 #, fuzzy
 msgid "Chair"
 msgstr "Araba"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 #, fuzzy
 msgid "Required Participant"
 msgstr "�stenen Bilgiler"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Se�imlik Bilgiler"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Bir Eylem Se�in"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "Silinen"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Giri�imli"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinen"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "��lemde"
@@ -5057,114 +5206,120 @@ msgstr "��lemde"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 msgid "%A, %B %d, %Y"
 msgstr "%d %B %A, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%d %b %Y %a"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Ofiste De�il"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Bilgi Yok"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Ba�kalar�n� Davet Et..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Se�enekler"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "_Sadece �al��ma Saatlerini G�ster"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "_Uzakla�t�r�lm�� G�ster"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "_Bo�/Me�gul Olanlar� G�ncelle"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "_Otomatikman se�"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "_T�m Ki�iler ve Kaynaklar"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "T�m _Ki�iler ve Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "_Gerekli Ki�iler"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Gerekli Ki�iler ve _Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Toplant� b_a�lama saati :"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Toplant� _biti� saati:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "%s deposu a��l�yor"
+
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s i�indeki g�revler y�klenemedi."
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' y�klemek i�in gereken y�ntem desteklenmiyor"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Yeni Randevu..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini a��lamad�."
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' a�mak i�in gereken y�ntem desteklenmiyor"
 
+#: calendar/gui/gnome-cal.c:1865
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Takvimi a�"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -5222,237 +5377,283 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eyl�l"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Alarm bilgilendirme servis mimarisi olu�turamad�m"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "39."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "Pz"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "�a"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Ct"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ge�erli g�n (%d %b %a %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%d %b %a"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%d %a %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%d %b %a %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Ge�erli hafta (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Ge�erli ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Ge�erli y�l (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "G�rev"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Durum:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "�_ncelik:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Biten y�zde"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"S�n�flar: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Ba�lant�"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Takvimi Yazd�r"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "�nizlemeyi Yazd�r"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "��eyi Yazd�r"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Yazd�rma Ayarlar�"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "G�sterilecek g�revler dizininin URI'si"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr "Takvim g�r�n�m� yarat�lamad�. ORBit ve OAF kurulumunu g�zden ge�irin."
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 "Evolution takvim dizininde bulunan t�m g�revleri g�revler dizinine aktard�."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5463,7 +5664,7 @@ msgstr ""
 "g�ndermeyi denedi, ancak baz� g�revler ta��namad�. Bu i�lemi daha sonra "
 "tekrar deneyiniz."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5472,127 +5673,127 @@ msgstr ""
 "`%s' a��lamad�. Takvim dizininden g�revler dizinine g�nderilecek ��e "
 "bulunmuyor."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr "`%s' y�klemek i�in gereken y�ntem desteklemiyor."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "PPS�PCCP"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now hi� arg�man istemiyor"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time 1 arg�man istiyor"
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time i�in birinci arg�man bir dizi olmal�d�r."
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 1. arg�man� ISO 8601 tarih/saat bilgisi olmal�d�r"
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 2 arg�man istiyor"
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-day-end birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 2. arg�man� bir say� istiyor"
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin bir arg�man istiyor"
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end bir arg�man istiyor"
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype hi� arg�man istemiyor"
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "ocrur-in-time-range? iki arg�man istiyor"
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 #, fuzzy
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "time-day-end birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 #, fuzzy
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "time-day-end birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? iki arg�man istiyor"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? birinci arg�man� dizgi �eklinde istiyor"
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ikinci arg�man� dizgi �eklinde istiyor"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 #, fuzzy
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "contains? birinci arg�man� dizgi �eklinde istiyor"
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 #, fuzzy
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? t�m arg�manlar� dizgi �eklinde istiyor"
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 #, fuzzy
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr "has-categories? t�m arg�manlar� dizgi �eklinde istiyor"
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "time-now hi� arg�man istemiyor"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "time-now hi� arg�man istemiyor"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin birinci arg�man� time_t bi�iminde istiyor"
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5616,7 +5817,7 @@ msgstr "Bu �ifre ile �ifreleme desteklenmiyor"
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu �ifreleme ile geriye d�n�k �ifreleme desteklenmiyor"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5624,7 +5825,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5632,94 +5833,94 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr "Bu i�lemi bitirmek i�in �nternet ba�lant�s� sa�lamal�s�n�z"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Dizinler e�zamanl� hale getiriliyor"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Spool dizini a��lamad�"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Spool dizini i�lenemedi"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi al�n�yor"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "�leti a��lamad�"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Dizin e�zamanl� hale getiriliyor"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti al�n�yor"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayr��t�r�rken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini �al��t�r�rken hata oldu: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramas�n� �al��t�r�rken hata oldu: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Arama deyimi �al��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Arama deyimi �al��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "�letiler kopyalan�yor"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5728,7 +5929,7 @@ msgstr ""
 "Arama deyimi ayr��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5737,7 +5938,7 @@ msgstr ""
 "Arama deyimi �al��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(hepsini-e�le) boolean sonu� i�ermelidir"
 
@@ -5746,197 +5947,197 @@ msgstr "(hepsini-e�le) boolean sonu� i�ermelidir"
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen ba�l�k �zerinde arama yap�l�yor: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "G�vde i�eri�inde ge�ersiz t�r. Dizgi bekleniyordu"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Boru yarat�lamad�: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "�atallama yap�lamad�: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s i�in kilitleme dosyas� olu�turulamad�: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "%s dosyas�n�n kilidinin a��lmas�n� beklerken zaman a��m�. Daha sonra yeniden "
 "deneyiniz."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) kullan�l�rken kilitleme hatas�: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullan�l�rken kilitleme hatas�: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "E-posta dosyas� %s denetlenemedi: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-posta dosyas� %s a��lamad�: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ge�ici e-posta dosyas� %s a��lamad�: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "%s ge�ici mektup dosyas�n� olu�tururken hata: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yarat�lamad�: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�atallama yap�lamad�: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program�nda hata: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Bilinmeyen hata)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "%s posta dosyas�n� okurken hata olu�tu"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ge�ici mektup dosyas�na yazarken hata: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ge�ici mektup dosyas�na yazarken hata: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "%s parolas�n� %s i�in parolay� girin"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "%s parolas�n� girin"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "�leti g�nderilemiyor: g�nderen adresi ge�ersiz"
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile ba�lant� kurulamad�: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile ba�lant� kurulamad�: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "%s ge�ici dosyas� yarat�lamad�"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "�leti g�nderilemiyor: g�nderen adresi ge�ersiz"
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile ba�lant� kurulamad�: %s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile ba�lant� kurulamad�: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s y�klenemedi: Bu sistemde mod�l y�kleneme desteklenmiyor."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s y�klenemedi: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s y�klenemedi: Mod�lde ba�lang�� kodu bulunamad�"
@@ -5956,7 +6157,7 @@ msgid "Connection cancelled"
 msgstr "Ba�lant� iptal edildi"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine ba�lant� kurulamad� (%d): %s"
@@ -5966,12 +6167,12 @@ msgid "(unknown host)"
 msgstr "(bilinmeyen makine)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "��lem iptal edildi"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir �ekilde ba�lant�y� kesti"
@@ -6078,7 +6279,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�."
 
@@ -6095,8 +6296,8 @@ msgid "Unknown authentication state."
 msgstr "Bilinmeyen kimlik denetim konumu."
 
 #: 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:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Parola"
 
@@ -6126,55 +6327,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "D�zg�n deyim derleme i�lemi ba�ar�s�z: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL'inde kullan�c� bilgisi bulunmuyor"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL'inde makine ad� bilgisi bulunmuyor"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "��z�mleniyor: %s"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "�sim ��z�mlemesinde hata: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine ad� ��z�mlemesinde hata: %s: Makine bulunamad�"
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine ad� ��z�mlemesinde hata: %s: bilinmeyen hata"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Sanal dizin e-posta sa�lay�c�s�"
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "di�er bir dizin listesinden al�nan iletileri okumak i�in"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokol� i�in al�c� yok"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6220,17 +6421,17 @@ msgstr "Mesaj�n a��lmas�nda hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6240,7 +6441,7 @@ msgstr ""
 "Konu: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6255,7 +6456,7 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6274,37 +6475,37 @@ msgstr ""
 "B�lge: %s\n"
 "�ehir: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL a��lamad�: %s"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Bu isimle bir ileti yok: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini al�namad�: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizini al�namad�: %s"
@@ -6337,59 +6538,59 @@ msgstr "IMAP sunucu cevab� %s bilgisini i�ermiyor"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yarat�lamad�: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s i�in �zet bilgisi y�klenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden olu�turuldu."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�letiler kaydediliyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Bu ileti kullan�labilir de�il"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "�letiler kaydediliyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevab�nda ileti g�vdesi bulunamad�"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "�nbellek dizini yarat�lamad�: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Mesaj�n a��lmas�nda hata."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
@@ -6397,7 +6598,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri t�m dizinlerde denetle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -6432,28 +6633,28 @@ msgstr ""
 "Bu se�enek IMAP sunucusuna a��k metin parola kullanarak ba�lant� kurulmas�n� "
 "sa�lar."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP sunucusu %s kimlik s�nama y�ntemini desteklemiyor"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik s�nama y�ntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sL�tfen %s@%s i�in IMAP parolas�n� giriniz"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6464,95 +6665,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH bi�imli e-posta dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "�letileri MH benzeri e-posta dizinlerinde saklamak i�in"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "�zel Dizinler"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "�letileri standart UNIX posta kutusu dosyas�nda saklamak i�in"
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Qmail maildir bi�iminde mektup dosyalar�"
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "MH bi�imli e-posta dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "�letileri qmail maildir dizinleri halinde saklamak i�in"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standart UNIX posta kutusu dosyas�"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "�letileri Unix spool dizinleri halinde saklamak i�in"
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s saklama dizini ge�ersiz"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "%s dizini al�namad�: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Yerel disklerde gelen dizini bulunmas�n"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyas� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s dizininin ad� %s olarak de�i�tirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' dizin �zet dosyas� silinemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' dizin indeks dosyas� silinemedi: %s"
@@ -6563,23 +6767,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "%s i�in �zet bilgisi y�klenemedi"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�leti �zete eklenemedi: bilinmeyen neden"
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "%d iletisinde hata"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "%s dizinine ileti eklenemedi: %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6588,20 +6797,20 @@ msgstr ""
 "�leti al�namad�: %s\n"
 "  %s"
 
-#: 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:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "�leti bulunmuyor"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ge�ersiz ileti i�eri�i"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6610,15 +6819,15 @@ msgstr ""
 "Dizin a��lamad�: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "%s dizini bulunamad�."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6627,19 +6836,19 @@ msgstr ""
 "'%s dizini yarat�lamad�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "maildir dizini de�il"
 
@@ -6654,29 +6863,34 @@ msgstr "'%s dizini taranamad�: %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir dizini a��lamad�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "%s posta kutusu a��lamad�: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "��lem iptal edildi"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "�leti mbox dosyas�na eklenemedi (%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:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6685,17 +6899,17 @@ msgstr ""
 "%s iletisi %s dizininden al�namad�\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onar�lamayacak �ekilde bozulmu�."
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�letiler d�zenlenemiyor: �leti kutusu bozulmu� olabilir."
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6704,7 +6918,7 @@ msgstr ""
 "`%s' dosyas� a��lamad�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6713,14 +6927,14 @@ msgstr ""
 "`%s' dosyas� yarat�lamad�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir dosya de�ildir."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6729,108 +6943,116 @@ msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini bo� de�il. Silinmedi."
 
 #. 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-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Dizin e�zamanl� hale getiriliyor"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Dizin a��lamad�: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yak�n�nda e-posta ayr��t�rma hatas� (dizin: %s)"
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "%s dizini al�namad�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "%s dosyas� a��lamad�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ge�ici posta kutusu a��lamad�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "�zet ve dizin uyu�mazl���"
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ge�ici posta kutusuna yazma hatas�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ge�ici dosya kutusuna yazma i�lemi ba�ar�s�z: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s a��lamad�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "ge�ici dizin kapat�lamad�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin ad� de�i�tirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Ba�lant�ya ileti g�nder"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mesaj mh dizinine eklenemedi: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin de�il."
@@ -6840,133 +7062,116 @@ msgstr "`%s' bir dizin de�il."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH dizin yolu a��lamad�: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "�leti mbox dosyas�na eklenemedi (%s): %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' normal bir dosya de�ildir."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "%s dizini bulunamad�."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Yerel mektup dosyas� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. 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
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Dizin �zeti ��kart�l�yor"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Dizin a��lamad�: %s: %ld konumundan itibaren �zet ��kart�l�yor: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Dizin �zeti ��kart�lamad�: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ge�ici e-posta dosyas� %s a��lamad�: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "'%s dizini taranamad�: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "%s y�klenemedi: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s i�in NNTP parolas�n� giriniz"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Kullan�c� ad� sunucu taraf�ndan reddedildi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Sunucuya kullan�c� ad� g�nderilemedi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Sunucu kullan�c� ad� ve parolas�n� reddetti"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "%s iletisi bulunamad�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Sunucudan grup listesi al�namad�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s i�in grup liste dosyas� al�namad�: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s i�in grup liste dosyas� kaydedilemedi: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET haber grubu"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "USENET haber gruplar�ndan ileti okuma ve g�nderme i�in sa�lay�c�."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Haber sunucusu i�in dizin a��lamad�: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s �zerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6974,73 +7179,73 @@ msgstr ""
 "Bu se�enek NNTP sunucusuna a��k metin parola �zerinden kimlik denetimi "
 "yapt�r�r."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s i�in .newsrc dosyas� a��lamad� ya da olu�turulamad�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "POP �zeti al�n�yor"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP sunucuya ba�lant� kurulamad�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Dizin a��lamad�: �leti listesi tamamlanmad�."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Se�ili iletileri kes"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "�letiler al�namad�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "%s POP sunucusundan iletileri alamad�m: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s kullan�c� numaras�yla ileti yok"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP iletisi al�n�yor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "�leti deposu"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "�letileri sunucuda b�rak"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "%s g�nden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "IMAP sunucular� ileti alma ve g�ndermede kullanmak i�in"
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -7048,7 +7253,7 @@ msgstr ""
 "Bu se�enek POP sunucuya a��k metin parola kullanarak ba�lant� kurar. Pek �ok "
 "POP sunucusu taraf�ndan desteklenir."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 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 "
@@ -7056,33 +7261,33 @@ msgid ""
 msgstr ""
 "Bu se�enek POP sunucuya �ifreli APOP protokol�n� kullanarak ba�lant� kurar."
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "POP sunucuya ba�lant� kurar ve Kerberos 4 kullanarak kimlik denetimi yapar."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP sunucuyla ba�lant� kurulamad�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Sunucuya ba�lant� kurulamad�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s �zerindeki POP sunucuya ba�lant� kurulamad�"
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sL�tfen %s@%s i�in POP3 parolas�n� girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7091,12 +7296,12 @@ msgstr ""
 "POP sunucuya ba�lant� kurulamad�.\n"
 "Kullan�c� ad� g�nderilirken hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Bilinmeyen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7104,7 +7309,7 @@ msgstr ""
 "POP sunucusuyla ba�lant� kurulamad�.\n"
 "Belirtilen kimlik s�nama protokol� desteklenmiyor."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7113,193 +7318,193 @@ msgstr ""
 "POP sunucusuyla ba�lant� kurulamad�.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Yerel sistemdeki sendmail program�n�n e-postalar� g�ndermesi i�in."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ile ba�lant� kurulamad�: %s: ileti g�nderilemedi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail �al��t�r�lamad�: %s: ileti g�nderilemedi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�leti g�nderilemedi: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s sinyali ile kapand�: ileti g�nderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s �al��t�r�lamad�: ileti g�nderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d durumu ile ��kt�: ileti g�nderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "�letide 'From' adresi bulunamad�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail �zerinden ileti g�nderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP �zerinden bir sunucuya ba�lan�p e-postalar�n�z� g�ndermek i�in.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "�mla hatas�, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da arg�manlarda imla hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Komut hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yard�m yan�t�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Yard�m mesaj�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Servis haz�r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Servis ileti�im kanal�n� kapat�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Servis uygun de�il, ileti�im kanal� kapat�l�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "�stenen ileti i�lemi tamamland�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Kullan�c� yerel de�il, <forward-path> �zerine y�nlendirilecek"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "�stenen ileti eylemi yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�stenen eylem yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "�stenen eylem iptal edildi: i�lem s�ras�nda hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Kullan�c� yerel de�il; l�tfen <forward-path> deneyin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "�stenen eylem yap�lmad�: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "�stenen eylem iptal edildi: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "�stenen eylem yap�lmad�: e-posta kutusu izni yok"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "�leti ba�lang�c�n� girin, <CRLF>.<CRLF> ile bitirin."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "�leti�im kurulamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik s�nama y�ntemi �ok zay�f"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "�stenen kimlik s�nama y�ntemi i�in �ifreleme gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Ge�ici kimlik denetim hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Giri� hatas�: %s: �nemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s SMTP sunucusu %s kimlik s�nama y�ntemini desteklemiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sL�tfen %s@%s i�in SMTP parolas�n� giriniz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7310,169 +7515,169 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s �zerinden STMP ileti g�nderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "�leti g�nderilemiyor: g�nderen adresi tan�ml� de�il."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "�leti g�nderilemiyor: g�nderen adresi ge�ersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "�leti g�nderiliyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Toplant�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yarat�lamad�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH iste�i zaman a��m�na u�rad�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH iste�i ba�ar�s�z."
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA iste�i zaman a��m�na u�rad�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA g�nderimi zaman a��m�na u�rad�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET iste�i zaman a��m�na u�rad�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cevap hatas�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT iste�i zaman a��m�na u�rad�: %s: �nemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT cevap hatas�: %s: �nemsiz"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "ek"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Se�ili dosyalar� ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "�letiyi bir dosya ekle"
 
@@ -7504,52 +7709,52 @@ msgstr "MIME t�r�:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik g�sterimini �ner"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Adres defteri i�in buraya t�klay�n"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "G�nderen:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Al�c�:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "�letinin g�nderildi�i ki�iler"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�letinin kopyas�n�n g�nderilecek olundu�u adresler"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7562,7 +7767,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7571,30 +7776,30 @@ msgstr ""
 "%s dosyas�n� y�klerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Farkl� kaydet..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Uyar�"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyas�n� kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyas�n� y�klerken hata oldu"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7602,17 +7807,17 @@ msgstr ""
 "Bu hesap i�in taslak dizini a��lamad�.\n"
 "�ntan�ml� taslak dizinini kullanmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1048
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "%s dosyas�n� kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1056
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP sunucusundan iletileri alamad�m: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7621,7 +7826,7 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1070
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7630,7 +7835,7 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1079
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7639,7 +7844,7 @@ msgstr ""
 "�letilerin kayd�nda hata: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1181
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7648,7 +7853,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7657,28 +7862,39 @@ msgstr ""
 "Bu ileti g�nderilmedi.\n"
 "De�i�iklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Y�nlendirilen iletiler"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Dosyay� a�"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Mektup g�nderme penceresi a��lamad�."
+#: composer/e-msg-composer.c:2346
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2369
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"E-posta d�zenleme penceresi a��lmad�, ��nk� ad�n�z� ve\n"
+"e-posta bilgilerinizi girmediniz."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7686,11 +7902,11 @@ msgstr ""
 "E-posta d�zenleme penceresi a��lmad�, ��nk� ad�n�z� ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution posta program� a��lamad�."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7746,15 +7962,24 @@ msgstr "�sim i�eri�i"
 msgid "Subject does not contain"
 msgstr "i�ermez"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Bu parolay� hat�rla"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %a %H:%M"
 
@@ -7813,30 +8038,30 @@ 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:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
@@ -7976,7 +8201,7 @@ msgstr "Sonra"
 msgid "Add action"
 msgstr "Eylem ekle"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -7985,16 +8210,16 @@ msgstr ""
 "Bir dizin se�meyi unuttunuz.\n"
 "L�tfen geriye gidip ge�erli bir dizin se�in."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Dizini Se�in"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Dizin URI girin"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<bir dizin se�mek i�in t�klay�n>"
 
@@ -8011,39 +8236,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Kural ad�:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "�simsiz"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "E�er"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Eylemleri i�let"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "t�m kriterler sa�lan�rsa"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter sa�lan�rsa"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "S�n�f ekle"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "giden"
 
@@ -8237,7 +8462,7 @@ msgstr "Cevaplanan"
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "G�nderen"
 
@@ -8270,7 +8495,7 @@ msgstr "ba�layan"
 msgid "Stop Processing"
 msgstr "��lemeyi Durdur"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Konu"
@@ -8283,15 +8508,15 @@ msgstr "daha �nce"
 msgid "was before"
 msgstr "daha sonra"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "G�revler"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "G�rev Ekle"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "G�rev D�zenle"
 
@@ -8299,47 +8524,47 @@ msgstr "G�rev D�zenle"
 msgid "Score Rules"
 msgstr "Puan Kurallar�"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "E-posta alma va g�nderme i�in Evolution bile�eni"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Al�n�yor"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "biter"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "%s al�n�yor.\n"
 "%s ba�lat�l�yor"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" g�nderiliyor"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "�leti"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -8347,20 +8572,15 @@ msgstr ""
 "Evolution, Elm ileti dosyalar� buldu.\n"
 "Bunlar� Evolution'a aktarmak ister misiniz?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Kart: "
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adres Defteri"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8368,24 +8588,24 @@ msgstr ""
 "Evolution, GnomeCard dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP dizini taran�yor"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8393,11 +8613,11 @@ msgstr ""
 "Evolution, Netscape e-posta dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -8405,7 +8625,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Yazd�r"
@@ -8442,253 +8662,258 @@ msgstr "E-posta �zet bile�en mimarisi"
 msgid "Mail configuration interface"
 msgstr "�leti yap�land�rma aray�z�"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "E-posta Listesi �zerinde VFolder"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Sanal Dizinler"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Sanal Dizinler"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Sunucuya ba�lant� kurulamad�: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "�_zellikler..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Bu dizinin �zelliklerini de�i�tir"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_�letiyi G�nder"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_�letiyi G�nder"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Depo kabu�a kay�t ettirilemedi"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �zellikleri"
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "�zellikler"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ge�ici dizin yarat�lamad�: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d dakika"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Silinen"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniye"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d saniye"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�_letiden Bir Filtre Yarat"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "_Konuya G�re VFolder"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "_G�nderene G�re VFolder"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "_Al�c�lara G�re VFolder"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi �zerinde VFolder"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "_Konuya G�re Filtrele"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "_G�nderene G�re Filtrele"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "_Al�c�lara G�re Filtrele"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine G�re Filtrele"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�letiyi Yazd�r..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "_Farkl� Kaydet..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "_Yazd�r"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "_G�nderene Cevapla"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "_T�m�ne Cevapla"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "_Y�nlendir"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "_Okunmu� Olarak ��aretle"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�nemli"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "_Dizine Ta��..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "G�ndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "�letiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "E-posta Listelerine G�re Filtreleme"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "E-posta Listesi �zerinde VFolder"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "E-posta Listesi �zerinde VFolder (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "�_ntan�ml�"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8711,18 +8936,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Outlook Express dosyalar�n� Evolution'a aktar�r"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "i�erir"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "G�ncel depolama bi�imi:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "�_ndex"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Posta Kutusu Bi�imi"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Yeni depolama bi�imi:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8732,15 +8967,15 @@ msgstr ""
 "diskin dolmas� gibi hatalarda veri kay�plar� olabilir.\n"
 "L�tfen bu �zelli�i dikkatli kullan�n."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "pdizini"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "pkutusu"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8759,16 +8994,16 @@ msgstr "Evolution Hesap D�zenleyici"
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap D�zenleyici"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "PGP imza dosyas� olu�turulamad�."
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "�mzay� kaydet"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8778,7 +9013,7 @@ msgstr ""
 "\n"
 "De�i�iklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8794,55 +9029,55 @@ msgstr "Kapat"
 msgid "Enable"
 msgstr "Etkinle�tir"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Ger�ekten bu hesab� silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Sil"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 #, fuzzy
 msgid "Really delete account?"
 msgstr "Bunu �ntan�ml� hesab�m yap"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ger�ekten bu haber grubu hesab�n� silmek istiyor musunuz?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "E-posta Ayarlar�..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "%s'e Postala"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Konu: %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "%s'ten E-posta"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Filtre Kural� Ekle"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8854,7 +9089,7 @@ msgstr ""
 "�nce yapman�z gerekiyor.\n"
 "�imdi yap�land�rmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8862,7 +9097,7 @@ msgstr ""
 "�leti g�ndermeden �nce kendinize\n"
 "ait bir kimlik olu�turmal�s�n�z."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8870,23 +9105,23 @@ msgstr ""
 "�leti g�ndermeden �nce bir posta\n"
 "iletim ayar� yapmal�s�n�z."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim y�ntemi d�zenlenmemi�"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Bir e-posta g�nder"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8894,18 +9129,18 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de g�nderilsin mi?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8917,42 +9152,42 @@ msgstr ""
 "getirebilir.\n"
 "Yine de g�ndereyim mi?"
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 #, fuzzy
 msgid "This message contains invalid recipients:"
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postay� g�ndermek i�in al�c�s�n� belirtmeniz gereklidir."
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Bu e-postay� g�ndermeden �nce bir hesap ayar� yapmal�s�n�z."
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Bilinmeyen hata"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "�letileri buraya ta��"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "�leti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ger�ekten %d iletiyi d�zenlemek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8960,7 +9195,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri d�zenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8968,28 +9203,28 @@ msgstr ""
 "Sadece G�nderilen dizinine kaydedilen\n"
 "iletileri yeniden g�nderebilirsiniz."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ger�ekten %d iletiyi yeniden g�ndermek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Hi� �leti Se�ilmedi"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "�letiyi Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "�letileri Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Uyar�"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8997,12 +9232,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Tekrar sorma"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9011,19 +9246,19 @@ msgstr ""
 "Filtre bilgisini y�klerken hata olu�tu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "�letiyi Yazd�r"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "�letiyi yazd�r�lmas�nda hata"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ger�ekten %d iletiyi farkl� pencerelerde a�mak istiyor musunuz?"
@@ -9081,17 +9316,17 @@ msgstr ""
 "olacakt�r. L�tfen a�a��daki bo�lu�a bu hesap i�in bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbaz�"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesap"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9102,16 +9337,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "pkutusu"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Sunucuya ba�lant� kuruluyor..."
 
@@ -9130,31 +9365,31 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "Bu �ifreleme ile imza desteklenmiyor"
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Hesap"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesap Y�neticisi"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9166,28 +9401,25 @@ msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Kimlik Denetim T�r�: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Yeni iletiler denetleniyor"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr "Sertifika No:"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "D�zenleyici"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "E-posta Yap�land�rmas�"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9203,247 +9435,251 @@ msgstr ""
 "\n"
 "Ayarlar�n�z� kaydetmek i�in \"Bitir\" d��mesine t�klay�n."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "�_ntan�ml�"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "�ntan�ml� \"Y�nlendirme\" t�r�: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "Default character encoding: "
 msgstr "�ntan�ml� karakter k�mesi: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "Say�sal Numaralar..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "G�sterim"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Tamamland�"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Taslaklar dizini:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "Etkinle�tir"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "D�zenle..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "Etkinle�tir"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "Say�sal Numaray� Al..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "HTML �mzas�:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "_Ba�lant�da"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "E-posta Yap�land�rmas�"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Posta Kutusu Bi�imi"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "Bunu �ntan�ml� hesab�m yap"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP Sunucusu"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Haberler"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Se�imlik Bilgiler"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "PGP _Key ID:"
 msgstr "PGP Anahtar Numaras�:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Bir renk se�in"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Bu konuyla iletileri filtrelemek i�in kural olu�tur"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Bu konuyla iletileri filtrelemek i�in kural olu�tur"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotelenmi�"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Bu parolay� hat�rla"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "E-posta Al�n�yor"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "E-posta Al�n�yor"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Alma Se�enekleri"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "�stenen Bilgiler"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "G�venli MIME"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "G�venlik"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Bir dosya se�in"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP program�n� se�in"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posta G�nderiliyor"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "E-posta G�nderiliyor"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "G�nderildi"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "G�nderilen iletiler dizini:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "G�nderilen ve Taslak �letileri"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "G�nderilen iletiler dizini:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Sunucu Yap�land�rmas�"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
-msgstr "Sunucu T�r�: "
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server requires _authentication"
-msgstr "Sunucu kimlik denetimi istiyor"
+msgid "Server _Type: "
+msgstr "Sunucu T�r�: "
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "�mza dosyas�:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Bilgi Yok"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "�zel Dizinler"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyas�"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Use secure connection (_SSL)"
+msgid "Use s_ecure connection (SSL)"
 msgstr "G�venli ba�lant� (SSL) kullan"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9454,121 +9690,145 @@ msgstr ""
 "\n"
 "Devam etmek i�in \"�leri\" d��mesine t�klay�n."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Kimlik Denetim T�r�: "
+
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr "E-postalar� otomatik denetle:"
 
 #: mail/mail-config.glade.h:95
 #, fuzzy
-msgid "_Check for supported types"
-msgstr " Desteklenen t�rleri denetle "
+msgid "_Certificate ID:"
+msgstr "Sertifika No:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Taslaklar dizini:"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "E-posta Adresi:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Tam �sim:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "HTML �mzas�:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Renklendir: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "Makina:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "G�nderici adres defterinde ise resimleri y�kle"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "�letileri okunmu� olarak i�aretle:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Name:"
 msgstr "�sim:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Kurum:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Yol:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Bu parolay� hat�rla"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "E-postalar� �ntan�ml� olarak HTML g�nder."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Sunucu T�r�: "
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "�mza dosyas�:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Kullan�c� ad�:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Her"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "A��klama:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "saniye."
 
@@ -9608,156 +9868,150 @@ msgstr "S/MIME �ifreli zarf i�eri�i olu�turulam�yor."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama i�eri�i olu�turulam�yor."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Diske Kaydet..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "�zle"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "%s i�inde a�..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�zle (%s kullanarak)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Harici �zleyici"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "�leti i�eri�i y�kleniyor"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Ba�lant�y� Taray�c�da A�"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Farkl� kaydet"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Farkl� kaydet..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi a��lamad�: Kaynak kodu g�steriliyor."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-posta Adresi:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "G�nderen"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Yan�tla:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Al�c�"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Gizli:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "GPG/PGP program yap�land�r�lmad�."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "�ifrelenmi� ileti g�sterilemiyor"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "�ifrelenmi� ileti"
+#: mail/mail-format.c:1799
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Bu ileti dijital olarak imzalanm��t�r ve g�venlidir."
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "�ifreyi a�mak i�in simgeye t�klay�n"
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1830
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ileti dijital olarak imzalanm��t�r ve g�venlidir."
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1838
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ileti dijital olarak imzalanm��, fakat g�venli oldu�u kan�tlanmam��t�r."
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine ba� (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "%s yerel dosyas�na ba� (\"%s\" adresinde ge�erli)"
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya ba� (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine ba� (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye ba� (\"%s\" t�r�nde)"
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr "Bozuk harici g�vde"
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yap�land�r�l�yor"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9766,29 +10020,29 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. B�y�k ihtimalle bu dizini \n"
 "yeniden a�amayacaks�n�z: %s"
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�iliyor"
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9796,17 +10050,17 @@ msgstr ""
 "E�er bu dizini tekrar a�amazs�n�z, elle \n"
 "d�zeltme yapmak zorunda kalacaks�n�z."
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bu ��p dizininden iletileri kopyalayamazs�n�z."
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Yeniden Yap�land�r: %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9815,7 +10069,7 @@ msgstr ""
 "'%s' s�ras�nda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9824,26 +10078,7 @@ msgstr ""
 "��lem s�ras�nda hata:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Bu parolay� hat�rla"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "%s i�in parolay� girin"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "%s i�in parolay� girin"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "�al���yor"
 
@@ -9852,121 +10087,114 @@ msgstr "�al���yor"
 msgid "Filtering Folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "E-posta Al�n�yor"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" g�nderiliyor"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti g�nderiliyor"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Tamamland�."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "�letiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�letiler %s'e ta��n�yor"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�letiler %s'e kopyalan�yor"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"Dosyalar kopyalanamad�\n"
-"`%s'."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Ta��n�yor"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopyalan�yor"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" i�inde dizinler taran�yor"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
 msgstr "��p"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini a��l�yor"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu a��l�yor"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Yeni dizin yarat�l�yor"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi al�n�yor"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "�letiler al�n�yor"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�letiler kaydediliyor"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9975,7 +10203,7 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9984,11 +10212,11 @@ msgstr ""
 "�letilerin kayd�nda hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9997,17 +10225,17 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yaz�lamad�: %s."
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ba�lant�s� kesiliyor"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ba�lant�s� kesiliyor"
@@ -10016,101 +10244,111 @@ msgstr "%s ba�lant�s� kesiliyor"
 msgid "_Search"
 msgstr "_Ara"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Ba�l�ks�z �leti)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Ba�l�ks�z �leti)"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "�leti"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "�letide Bul"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "K���k/b�y�k Harfe Duyarl�"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "�leri Do�ru Arat"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Bul:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "E�le�enler:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "�ptal ediliyor..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Sunucu T�r�: "
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "E-posta Al & G�nder"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "�ptal"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "G�ncelleniyor..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "�ptal edildi."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "Kullan�c� i�lemi iptal etti."
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "%s i�in parolay� girin"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "%s i�in parolay� girin"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Y�nlendirilmi� ileti - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Yeni dizin yarat�l�yor"
@@ -10120,7 +10358,7 @@ msgstr "Yeni dizin yarat�l�yor"
 msgid "Updating vfolders for uri: %s"
 msgstr "%s dizini %s adresine kopyalan�yor"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10129,30 +10367,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "VFolder D�zenle"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "�lt: (konusuz)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "�leti"
@@ -10213,7 +10451,7 @@ msgstr "%a %l %M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "�letiler kaydediliyor"
@@ -10240,27 +10478,27 @@ msgstr "\"%s\" i�inde dizinler taran�yor"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" i�inde dizinler taran�yor"
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" dizinine �ye olunuyor"
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden �yelik siliniyor"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dizin"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Bu bir toplant� iste�idir."
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10305,131 +10543,126 @@ msgstr "�yelikten ��k"
 msgid "Evolution component for the executive summary."
 msgstr "�zet i�in Evolution bile�eni"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution �zet bile�eni ilklendirilemedi."
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "�leti �zeti"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "�sim:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1504
 #, fuzzy
 msgid "Summary Settings"
 msgstr "�zet i�eri�i"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>RDF indirirken bir hata olu�tu</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "Ayarlar"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "Yeni G�rev"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "A��klama:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Hava Durumu"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "B�l�mler"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%d %B %A, %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "�zet"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "�letiyi yazd�r�lmas�nda hata"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo ba�lat�lamad�.\n"
 
@@ -10489,7 +10722,7 @@ msgstr "Az bulutlu"
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr "Ge�ersiz"
 
@@ -10561,1081 +10794,1088 @@ msgstr "Kuzeybat�"
 msgid "North - Northwest"
 msgstr "Kuzey - Kuzeybat�"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "G�ster"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Ya�murlu"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr "Yer yer ya�murlu"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr "Hafif ya�murlu"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr "Orta ya�mur"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr "K�smi ya�murlu"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 #, fuzzy
 msgid "Drifting rain"
 msgstr "A��klama i�eri�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Yeniden Ara"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Karl�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr "Yer yer kar ya����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr "Hafif kar ya����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
 msgstr "Orta �iddette kar ya����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr "A��r kar ya����"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr "Kar f�rt�nas�"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "A��klama i�eri�i"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr "Buzlanma"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr "Yer yer buzlanma"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr "Buz f�rt�nas�"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "E-posta"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "Birincil E-posta Adresi"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "E-posta Al�n�yor"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Bilinmeyen hata"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Toplant� Davetleri"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr "Sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr "Hafif sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr "Kal�n sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 msgid "Partial mist"
 msgstr "B�l�m b�l�m sisli"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 #, fuzzy
 msgid "Drifting mist"
 msgstr "E-posta listesi"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 #, fuzzy
 msgid "Shallow fog"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "Sakla"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "G�revleri g�ster"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr "Volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr "Yer yer volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr "Orta derecede volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr "Kal�n volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr "K�smi volkanik k�l"
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Kal�n volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr ""
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Orta derecede volkanik k�l"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 msgid "Sand"
 msgstr "Kumlu"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "�stbilgi"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "g�n"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
-msgstr ""
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
+msgstr "Yer yer kar ya����"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
-msgstr ""
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
+msgstr "Hafif ya�murlu"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Orta ya�mur"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
-msgstr ""
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
+msgstr "A��r kar ya����"
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "G�revleri g�ster"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "B�l�m b�l�m sisli"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
-msgstr ""
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
+msgstr "A��klama i�eri�i"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Yeniden Ara"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 #, fuzzy
 msgid "Dust"
 msgstr "A�ustos"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Kas�rga"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr "Yer yer kas�rga"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr "Orta �iddette kas�rga"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11646,7 +11886,7 @@ msgstr "Sil"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Cevaplanan"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11664,12 +11904,12 @@ msgstr "Dizini se�in"
 msgid "All news _feeds:"
 msgstr "Cevaplanan"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "M_etric"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
@@ -11715,16 +11955,13 @@ msgid "Show _today's tasks"
 msgstr "T�m�n� G�ster"
 
 #: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Tasks "
-msgstr "G�revler"
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  �nite:  "
+msgid "Tasks "
+msgstr "G�revler"
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
@@ -11746,14 +11983,13 @@ msgid "_Displayed feeds:"
 msgstr "G�sterim"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_Five days"
-msgstr "Cuma"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "_Imperial"
-msgstr "Nisan"
+msgid "_Five days"
+msgstr "Cuma"
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
@@ -11794,26 +12030,26 @@ msgstr "Ayr�nt�lar"
 msgid "Cancel Operation"
 msgstr "Toplant�y� �_ptal Et"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 #, fuzzy
 msgid "Inbox"
 msgstr "pkutusu"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
 #, fuzzy
 msgid "Outbox"
 msgstr "pkutusu"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "�zel Dizinler"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Evolution kurulumu"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11821,17 +12057,17 @@ msgstr ""
 "Evolution'un bu yeni s�r�m� ki�isel Evolution dizinine ek dosya\n"
 "yerle�tirilmesini gerektirir."
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Dosyalar� kurmak i�in \"Tamam\" d��mesine, ya da i�lemi durdurmak i�in "
 "\"�ptal\" d��mesine t�klay�n."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Dosyalar d�zg�n bir �ekilde g�ncellenemedi"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11842,7 +12078,7 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11851,7 +12087,7 @@ msgstr ""
 "Dosyalar kopyalanamad�\n"
 "`%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11862,7 +12098,7 @@ msgstr ""
 "Evolution kullan�c� dosyalar�n�n y�klenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11871,7 +12107,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11882,6 +12118,19 @@ msgstr ""
 "kullan�lm�yor. L�tfen Evolution kullan�c� dosyalar�n�n\n"
 "kopyalanabilmesi i�in bu dizini ta��y�n�z."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Telif hakk� 1999, 2000, 2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -11898,25 +12147,25 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "\"%s\" dizinini kopyalamak i�in bir dizin ad� verin:"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "\"%s\" dizinini ta��mak i�in bir dizin ad� verin:"
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Dizini ta��"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11925,18 +12174,18 @@ msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Sil"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Ger�ekten '%s' dizinini silmek istiyor musunuz?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11945,16 +12194,22 @@ msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "'%s' dizini yeniden isimlendir"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "'%s' dizini yeniden isimlendir"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Belirtilen dizin ad� ge�erli de�ildir."
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11964,34 +12219,11 @@ msgstr ""
 "Belirlenen dizin yarat�lamad�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Al�c� belirtilmedi"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "�nbellek dizini yarat�lamad�: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Belirtilen dizin ad� ge�erli de�ildir."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11999,19 +12231,19 @@ msgstr ""
 "�stenen i�lem i�in se�ili dizin tipi \n"
 "ge�erli de�ildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Yeni..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -12025,13 +12257,13 @@ msgstr ""
 "E�er dosya t�r�n� bilmiyorsan�z \"Otomatik\" se�ene�ini i�aretleyin. Bu "
 "durumda Evolution dosya t�r�n� bulmaya �al��acakt�r."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12042,7 +12274,7 @@ msgstr ""
 "(Haz�r de�il).\n"
 "5 saniye i�inde yeniden denenecek."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12051,16 +12283,16 @@ msgstr ""
 "%s al�n�yor\n"
 "%d ��esi al�n�yor."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "%s dizini bulunamad�."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -12069,11 +12301,11 @@ msgstr ""
 "Bunu a�abilecek hi� bir filtre bulunamad�:\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Al�n�yor"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12082,17 +12314,17 @@ msgstr ""
 "%s al�n�yor.\n"
 "%s ba�lat�l�yor"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "%s ba�lat�rken hata olu�tu"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "%s y�klenirken hata olu�tu"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12101,139 +12333,146 @@ msgstr ""
 "%s al�n�yor\n"
 "1. ��e al�n�yor."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Dosya ad�:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Bir dosya se�in"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Dosya t�r�:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "Harici dosya bi�imini aktar"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "G�nderen:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Dizini se�in"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "Bu veriyi almak i�in hedef dizin se�in"
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Aktar"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Ba�lant�lar kesiliyor..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Al�c� belirtilmedi"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "�nbellek dizini yarat�lamad�: %s"
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamad�."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy �al��t�r�lamad�."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Telif hakk� 1999, 2000, 2001 Ximian, Inc."
-
-#: shell/e-shell-view-menu.c:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"Evolution, GNOME masa�st� i�in bir e-posta, \n"
-"takvim ve ileti�im listesi y�netim uygulamas�d�r."
+msgid "About Ximian Evolution"
+msgstr "Evolution Hakk�nda..."
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "A�mak istedi�iniz dizini se�in"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "Yeni bir k�sayol yarat"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "K�sayolu i�aret etmek istedi�iniz dizini se�in:"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "%s filtresini �al��t�r�rken hata oldu: %s"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "�evrimi�i �al��"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "�e_vrimd��� �al��"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "�evrimd��� �al��"
 
@@ -12241,27 +12480,17 @@ msgstr "�evrimd��� �al��"
 msgid "(No folder displayed)"
 msgstr "(dizin g�sterilmiyor)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 #, fuzzy
 msgid "(None)"
 msgstr "(hi�biri)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -12269,12 +12498,12 @@ msgstr ""
 "Evolution �evrimi�i �l���yor. Bu d��meye t�klayarak �evrimd��� �al��mas�n� "
 "sa�lay�n."
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution �evrimd��� �al��mak �zere haz�rlan�yor."
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -12282,12 +12511,12 @@ msgstr ""
 "Evolution �evrimd��� �al���yor. Bu d��meye t�klayarak �evrimi�i �al��mas�n� "
 "sa�lay�n."
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kay�t kurulamad� -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12295,37 +12524,33 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "Tamam"
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ge�ersiz ileti i�eri�i"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Depo kabu�a kay�t ettirilemedi"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Yeni bir k�sayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Grup ad�:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12334,116 +12559,116 @@ msgstr ""
 "K�sayol �ubu�undan `%s' grubunu \n"
 "kald�rmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "K�sayol Grubunu Yeniden �simlendir"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Se�ili k�sayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "_K���k Simgeler"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "K�sayollar� k���k simgeler olarak g�ster"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "_B�y�k Simgeler"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "K�sayollar� b�y�k simgeler olarak g�ster"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Yeni bir k�sayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Bu Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Bu k�sayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden �simlendir..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Bu k�sayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "K�sayol �ubu�unu _Gizle"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "K�sayol �ubu�unu gizle"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "K�sayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Se�ili k�sayollar� yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu k�sayola ba�l� dizini a�"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede A�"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu k�sayola ba�l� dizini yeni pencerede a�"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Bu k�sayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Sil"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu k�sayolu k�sayol �ubu�undan sil"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "K�sayollar� kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 #, fuzzy
 msgid "Shortcuts"
 msgstr "_K�sayol �ubu�u"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12452,65 +12677,171 @@ msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(isimsiz)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Ayn� isimli bir dizin zaten var"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin t�r� ge�erli de�ildir"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "G/� hatas�"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak i�in gerekli disk alan� yok"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamad�"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "��lem desteklenmiyor"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kay�tta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Belirtilen dizin bulunamad�"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "%s �zerinde dizin kilitlemesi yarat�lamad�: %s"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamland�)"
 
+#: shell/evolution-shell-component.c:1009
+#, fuzzy
+msgid "CORBA error"
+msgstr "G/� hatas�"
+
+#: shell/evolution-shell-component.c:1011
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1013
+#, fuzzy
+msgid "Invalid argument"
+msgstr "Ge�ersiz ileti i�eri�i"
+
+#: shell/evolution-shell-component.c:1015
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1017
+#, fuzzy
+msgid "No owner"
+msgstr "Yok"
+
+#: shell/evolution-shell-component.c:1019
+#, fuzzy
+msgid "Not found"
+msgstr "Dosya bulunamad�"
+
+#: shell/evolution-shell-component.c:1021
+#, fuzzy
+msgid "Unsupported type"
+msgstr " Desteklenen t�rleri denetle "
+
+#: shell/evolution-shell-component.c:1023
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1025
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Kullan�c� i�lemi iptal etti."
+
+#: shell/evolution-shell-component.c:1027
+#, fuzzy
+msgid "Internal error"
+msgstr "G/� hatas�"
+
+#: shell/evolution-shell-component.c:1031
+#, fuzzy
+msgid "Exists"
+msgstr "bulunur"
+
+#: shell/evolution-shell-component.c:1033
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Ge�ersiz"
+
+#: shell/evolution-shell-component.c:1037
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: shell/evolution-shell-component.c:1039
+#, fuzzy
+msgid "No space left"
+msgstr "Hi� �leti Se�ilmedi"
+
+#: shell/evolution-shell-component.c:1041
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Bilinmeyen hata"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -12615,81 +12946,71 @@ msgstr ""
 "Evolution dosya aktarma yard�mc� program�na ho�geldiniz\n"
 "Bu sihirbaz ile harici dosyalar� Evolution'a dahil edebileceksiniz."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Al�c�lar"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Alma"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Tekrar sorma"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "E-posta alma va g�nderme i�in Evolution bile�eni"
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution Ayarlar�..."
 
-#: shell/main.c:162
-#, fuzzy, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Merhaba. Evolution grup �al��ma uygulamas�n�n �nc� s�r�m�n�\n"
-"y�kledi�iniz i�in te�ekk�rler.\n"
-"\n"
-"Evolution geni� bir geli�tirici grubu taraf�ndan haz�rlanmaktad�r. Sizlerin "
-"de deste�ini bekliyoruz.\n"
-
-#: shell/main.c:183
-#, fuzzy
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Te�ekk�rler\n"
-"Evolution Grubu\n"
-
-#: shell/main.c:236
+#: shell/main.c:210
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution kabu�una eri�im yap�lamad�."
 
-#: shell/main.c:245
+#: shell/main.c:219
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution kabu�una eri�im yap�lamad�."
 
-#: shell/main.c:301
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "A��l�� ekran�ni g�sterme"
 
-#: shell/main.c:302
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "T�m hata ay�klama verilerini bir dosyaya yazd�r."
 
-#: shell/main.c:344
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo par�alar sistemi ba�lat�lamad�."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "`%s' dosyas�n� y�klerken hata oldu"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Dosyay� a�"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Dosya _Ekle"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Al�c� belirtilmedi"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12784,7 +13105,7 @@ msgstr "Y�klemeyi Durdur"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "E_ylemler"
@@ -12808,7 +13129,7 @@ msgid "_Forward Contact..."
 msgstr "_Ba�lant�lar..."
 
 #: 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/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Yazd�r..."
@@ -12859,7 +13180,7 @@ msgstr "G�n"
 msgid "Delete the appointment"
 msgstr "Bu randevuyu sil"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Git"
 
@@ -12994,11 +13315,12 @@ msgstr "Yazd�r..."
 
 #: 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
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Kaydet"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Kaydet ve Kapat"
 
@@ -13015,7 +13337,7 @@ msgstr "Bu ��eyi diske kaydet"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Dosya"
@@ -13037,7 +13359,7 @@ msgstr "Ba�lant�y� kaydet ve diyalog penceresini kapat"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Kaydet"
 
@@ -13101,10 +13423,6 @@ msgstr "Bu ��e _i�in toplant� zaman� d�zenle"
 msgid "Customise My Evolution"
 msgstr "Evolution'� �zelle�tir"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "�ptal"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "�imdiki e-posta i�lemini iptal et"
@@ -13364,301 +13682,331 @@ msgstr "Bu g�nderen i�in bir sanal dizin yarat"
 msgid "Create a virtual folder for this subject"
 msgstr "Bu konu i�in bir sanal dizin yarat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Sonraki �nemli iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Sonraki iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Sonraki okunmam�� iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "Sonraki okunmam�� konumu g�ster"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "�nceki �nemli iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "�nceki iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "�nceki okunmam�� iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "_E-posta Listelerine G�re Filtreleme"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "_G�nderene G�re Filtreleme"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "_Al�c�lara G�re Filtreleme"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "_Konuya G�re Filtreleme"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML iletideki resimleri y�kle"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Farkl� �let"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "_Eklentiyle Y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "�evrimi�i ilet"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Farkl� �let"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Se�ilen iletiyi birisine ilet"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Se�ilen e-postay� birisine ilet"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "Se�ilen iletiyi birisine y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Se�ilen iletiyi birisine eklenti olarak y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Metin dosyas� ekle..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Resimleri _Y�kle"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "�nemli"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Se�ili iletileri okunmu� olarak i�aretle"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Se�ili iletileri silmek i�in i�aretle"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Se�ili iletileri okunmam�� olarak i�aretle"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Se�ili iletileri silmek i�in i�aretle"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Se�ili iletileri silmek i�in i�aretle"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Ta��"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Se�ili iletileri ba�ka bir dizine ta��"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "�_leri"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Sonraki �nemli iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next Message"
 msgstr "�leti"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "Konumu _Se�"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next Unread Message"
 msgstr "(Ba�l�ks�z �leti)"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Se�ilen iletiyi yeni bir pencerede a�"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Se�ilen iletiyi d�zenleyicide yeniden g�ndermek �zere a�"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Yazd�r�lacak olan iletiyi �nizler"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Geri"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "�nceki �nemli iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Previous Message"
 msgstr "�letiyi Yazd�r"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "�nceki okunmam�� iletiyi g�ster"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "�letiyi Yazd�r"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Cevapla"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "T�m�ne cevapla"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "�le_ti Ara"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "�letiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "G�r�nt�lenen ileti i�inde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "G�ncel yaz�c� i�in sayfa ayarlar�n� yap"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "�leti _Kayna��n� G�ster"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "_Kapsaml� Ba�l�klar� G�ster"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "�letiyi normal bi�emde g�ster"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "�letiyi t�m ba�l�klar�yla g�ster"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "�letinin kayna��n� g�ster"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Se�ilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "_G�nderene G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "_Al�c�lara G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "_Konuya G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "_Filtreleri Uygula"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "�_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "�letiyi _Y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "�a�r� Cihaz�"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "�leti _G�r�n�m�"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "Dizine _Ta��"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "Normal _G�sterim"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "�_letiyi A� "
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Ara�lar"
@@ -13669,7 +14017,7 @@ msgstr "Bu pencereyi kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Kapat"
@@ -13700,11 +14048,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Bu iletiyi S/MIME �ifreleme sertifikas�yla �ifrele"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
-msgstr "_Bi�im"
+#, fuzzy
+msgid "For_mat"
+msgstr "Bi�im"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13753,7 +14103,7 @@ msgid "Save in folder..."
 msgstr "Dizine kaydet..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "�imdiki zaman� kaydet"
 
@@ -13847,7 +14197,7 @@ msgid "_From Field"
 msgstr "_G�nderen Alan�"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -13863,7 +14213,7 @@ msgstr "_Yan�tla Alan�"
 msgid "_Security"
 msgstr "_G�venlik"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Yard�m"
 
@@ -14111,10 +14461,6 @@ msgstr "_K�sayol �ubu�u"
 msgid "_Shortcut Bar"
 msgstr "_K�sayol �ubu�u"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "�e_vrimd��� �al��"
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -14195,142 +14541,146 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "�_imdiki G�r�n�m"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "G�r�n�mleri Tan�mla"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PS�PCCP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "�imdi"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Bug�n"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "G�n %s bi�iminde girilmelidir."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Y�zde de�eri 0 ile 100 aras�nda bulunmal�d�r."
+
+#: widgets/misc/e-charset-picker.c:58
 #, fuzzy
 msgid "Baltic"
 msgstr "Temel"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 #, fuzzy
 msgid "Greek"
 msgstr "hafta"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Turkish"
 msgstr "��p"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "�leti�im kurulamad�"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 #, fuzzy
 msgid "New"
 msgstr "Haberler"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 #, fuzzy
 msgid "Enter the character set to use"
 msgstr "�ntan�ml� karakter k�mesi: "
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 #, fuzzy
 msgid "Other..."
 msgstr "Di�er"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "�leti�im D�zenleyici"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Aramay� Kaydet"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Aramay� Kaydet"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 #, fuzzy
 msgid "Clear"
 msgstr "Takvim"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "T�m�n� G�ster"
 
@@ -14374,18 +14724,165 @@ msgstr "Ki�isel Adres Defteri Sunucusu"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Ki�isel Takvim Sunucusu"
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS ba�lat�lamad�"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME ba�lat�lamad�"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "Randevu i�in uyar�: Ba�lang�� tarihi %s, biti� tarihi %s"
+
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "%s tarihinde ba�layacak randevu i�in uyar�"
+
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "%s tarihinde bitecek randevu i�in uyar�"
+
+#~ msgid "Notification about your appointment"
+#~ msgstr "Randevu uyar�s�"
+
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "%s tarihinde ba�layacak ve %s tarihinde bitecek g�rev i�in uyar�"
+
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "%s tarihinde ba�layacak g�rev i�in uyar�"
+
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "%s tarihinde bitecek g�rev i�in uyar�"
+
+#~ msgid "Notification about your task"
+#~ msgstr "G�rev uyar�s�"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "%d %b %A, %Y %H:%M tarihinde alarm ver"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Bilinmeyen hata"
+
+#, fuzzy
+#~ msgid "_Invite Others"
+#~ msgstr "_Ba�kalar�n� Davet Et..."
+
+#~ msgid "_Confidential"
+#~ msgstr "_Gizli"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "A��klama:"
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Qmail maildir bi�iminde mektup dosyalar�"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Dizin �zeti ��kart�l�yor"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Dizin a��lamad�: %s: %ld konumundan itibaren �zet ��kart�l�yor: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Dizin �zeti ��kart�lamad�: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Mektup g�nderme penceresi a��lamad�."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Kart: "
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "GPG/PGP program yap�land�r�lmad�."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "�ifrelenmi� ileti g�sterilemiyor"
+
+#~ msgid "Encrypted message"
+#~ msgstr "�ifrelenmi� ileti"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "�ifreyi a�mak i�in simgeye t�klay�n"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "Dosyalar kopyalanamad�\n"
+#~ "`%s'."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Evolution �zet bile�eni ilklendirilemedi."
+
+#, fuzzy
+#~ msgid "Units: "
+#~ msgstr ""
+#~ "\n"
+#~ "  �nite:  "
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "Nisan"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "Evolution, GNOME masa�st� i�in bir e-posta, \n"
+#~ "takvim ve ileti�im listesi y�netim uygulamas�d�r."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\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"
+#~ "This product comes with no warranty and is not intended for\n"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Merhaba. Evolution grup �al��ma uygulamas�n�n �nc� s�r�m�n�\n"
+#~ "y�kledi�iniz i�in te�ekk�rler.\n"
+#~ "\n"
+#~ "Evolution geni� bir geli�tirici grubu taraf�ndan haz�rlanmaktad�r. "
+#~ "Sizlerin de deste�ini bekliyoruz.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Te�ekk�rler\n"
+#~ "Evolution Grubu\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "_Bi�im"
+
 #, fuzzy
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "%s i�in parolan�z� girin"
@@ -14413,10 +14910,6 @@ msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 #~ "`%s g�r�n�m� beklenmeyen bir �ekilde sonland�r�ld�.\n"
 #~ "%s bile�eni ��kt�."
 
-#, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "takvim bilgisi"
-
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
 #~ "�ncelik de�eri 'Y�ksek', 'Normal', 'D���k' ya da 'Tan�ms�z' olmal�d�r."
@@ -14621,19 +15114,12 @@ msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d %b %Y %a"
 
-#, fuzzy
-#~ msgid "%x"
-#~ msgstr "x"
-
 #~ msgid "Elm mail"
 #~ msgstr "Elm iletisi"
 
 #~ msgid "Pine mail"
 #~ msgstr "Pine iletisi"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Evolution e-posta bile�en mimarisi."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Y�nlendirilmi� ileti:\n"
 
@@ -14785,13 +15271,6 @@ msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 #~ msgid "Delegated From:"
 #~ msgstr "G�revi Da��t"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "Yok"
-
-#~ msgid "Task"
-#~ msgstr "G�rev"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "_Biten %:"
 
@@ -14961,9 +15440,6 @@ msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "_Ba�lant� (FIXME)"
 
-#~ msgid "_Index"
-#~ msgstr "�_ndex"
-
 #~ msgid "_Mail message"
 #~ msgstr "�_letiyi postala"
 
@@ -15004,18 +15480,12 @@ msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 #~ msgid "Notification about your journal entry"
 #~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
 
-#~ msgid "Open calendar"
-#~ msgstr "Takvimi a�"
-
 #~ msgid "Save calendar"
 #~ msgstr "Takvimi kaydet"
 
 #~ msgid "Show a dialog"
 #~ msgstr "Bir pencere g�ster"
 
-#~ msgid "Percent complete"
-#~ msgstr "Biten y�zde"
-
 #~ msgid "Edit this task"
 #~ msgstr "Bu g�revi d�zenle"
 
diff --git a/po/uk.po b/po/uk.po
index 45ac6b2d5c..018d5033da 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-10-25 10:54+0300\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2000-04-04 15:25+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "������� ������� ���̦� VCard � Evolutuion."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "������ ���̦� VCard � Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "������� ������� ���̦� VCard � Evolutuion."
@@ -21,291 +31,296 @@ msgstr "������� ������� ���̦� VCard � Evolutuion."
 msgid "Imports VCard files into Evolution."
 msgstr "������ ���̦� VCard � Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "���� ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "��'�:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "�-�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "����."
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "��ͦ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "����."
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "����Φ��æ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "��¦�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "������� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "���. ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "������ ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "������ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "���. 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "������� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "����� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "��Ħ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "�-����� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "�-����� 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "���Ħ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "�Ʀ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "��."
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "�����Ӧ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "����."
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "��Ҧ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "�Ҧ�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "���ͦ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "URI ���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "���.URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "���."
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "���� ����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "������Ҧ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "�Ҧ�����"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "������: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -313,7 +328,7 @@ msgstr ""
 "\n"
 "��'�: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -321,31 +336,31 @@ msgstr ""
 "\n"
 "  ���Ʀ��:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -353,7 +368,7 @@ msgstr ""
 "\n"
 "���� ����������: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -361,7 +376,7 @@ msgstr ""
 "\n"
 "������:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -369,13 +384,13 @@ msgstr ""
 "\n"
 "  ������� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -383,7 +398,7 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -391,7 +406,7 @@ msgstr ""
 "\n"
 "  �����:       "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -399,7 +414,7 @@ msgstr ""
 "\n"
 "  �ŭ���:      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -407,7 +422,7 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -415,13 +430,13 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -429,7 +444,7 @@ msgstr ""
 "\n"
 "��������:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -437,7 +452,7 @@ msgstr ""
 "\n"
 "�������:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -445,7 +460,7 @@ msgstr ""
 "\n"
 "���������� �����:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -453,7 +468,7 @@ msgstr ""
 "\n"
 "���������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -461,7 +476,7 @@ msgstr ""
 "\n"
 "������� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -469,7 +484,7 @@ msgstr ""
 "\n"
 "������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -477,7 +492,7 @@ msgstr ""
 "\n"
 "������������: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -485,7 +500,7 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -493,7 +508,7 @@ msgstr ""
 "\n"
 "����Φ��æ�: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -501,31 +516,31 @@ msgstr ""
 "\n"
 "  ��'�:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -533,7 +548,7 @@ msgstr ""
 "\n"
 "������Ҧ�: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -551,13 +566,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -565,12 +580,12 @@ msgstr ""
 "\n"
 "���̦���� ����: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "����������� ��צ��������"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard ��� %s"
@@ -579,16 +594,18 @@ msgstr "vCard ��� %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:1433
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1091
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� �Φæ�̦������ Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "�����..."
 
@@ -601,60 +618,60 @@ msgstr "������������..."
 msgid "Error in search expression."
 msgstr "������� � �ŭ�������� ����ڦ."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "�'������� � �������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "��������� �'�������� � �������� LDAP."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "�ަ������� �� �'������� � �������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "��������� ������ � �������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "��������� ������ � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "����� ������ �� �����Ҧ LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "��������� ��������Ԧ� ������ �� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "������ ����� �����."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:662
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "�� ������� ��������� ������ Wombat"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:663
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "�� ������� ��������� Wombat"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -701,38 +718,39 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr "������ ��� ��� ��������� ������� �����"
 
-#: addressbook/gui/component/addressbook-component.c:72
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "����, �� ͦ������ ��������� �������æ�"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "������ LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "������ LDAP, �� ͦ����� ��������� �������æ�"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "����� �������"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "����� �������"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "����� ���������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "����� ���������� ������"
 
@@ -766,7 +784,7 @@ msgid "Base"
 msgstr "��������"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 #, fuzzy
 msgid "Basic"
 msgstr "��������"
@@ -858,7 +876,7 @@ msgstr "������"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "�����������"
@@ -876,22 +894,27 @@ msgid "_Server name:"
 msgstr "����� �������:"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ������� �Φæ�̦������ gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "��������"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�� ������� צ������ ������� �����"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -899,96 +922,107 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���Ħ�� ������ ��� %s (���������� %s)"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "����-��� ���� ͦ�����"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "��'� ͦ�����"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "���������� ������ ͦ�����"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "������Ҧ� - "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:105
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "���������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "����-��� ������Ҧ�"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ����, �� ���� צ��������� ������������"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(�����)"
+
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "�������� �-�����"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "��¦� Ħ�"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "�������� ����� ������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "������ ������ �� ��������� �������� \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "����� ������ϧ �����..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "����������� ��������ϧ �������æ�"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "������ �� ������Ԧ�"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "���������� ������:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "���������� ������"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "��������� ������ (����������!)"
 
@@ -1001,36 +1035,36 @@ msgstr "����� ������ϧ ����� Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "�������� ���"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Sendmail"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "��������� ���������� ������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "���������� ���������� ������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d �� ��������)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
@@ -1044,7 +1078,15 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1104,12 +1146,12 @@ msgstr "�������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "�������� ������Ԧ�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�������æ"
 
@@ -1176,8 +1218,8 @@ msgstr "��������..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1236,49 +1278,56 @@ msgid "_Web page address:"
 msgstr "������ ���Ҧ��� WWW:"
 
 #: 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 "�� ������Φ, �� ������ ������ ��� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "������ �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "��� ������� �������� �� ����� ������Ҧ�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ������ צ����� ��� ����: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "������ ��������� ��������"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "����������� ������� ���Φ"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "����� ��'�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "�-�����"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2347,7 +2396,7 @@ msgid "contact-list-editor"
 msgstr "�������� ������Ԧ�"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "�������� ���������� ����˦�"
 
@@ -2396,13 +2445,13 @@ msgstr ""
 "�ͦ���� ��'� �� ���������� ������ ����� �������� ���\n"
 "���դ � æ� ��æ.  �� ������ �� ������ ���� �������?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:235
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "������������� �����"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "�����"
 
@@ -2421,9 +2470,9 @@ msgstr "������: %d"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.c:1407
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "�������� �� VCard"
@@ -2434,18 +2483,18 @@ msgid "Open"
 msgstr "��������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "��������� �������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "��Ħ����� ��צ�������� �� ���������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2453,94 +2502,100 @@ msgid "Print"
 msgstr "���������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "����������� �������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������� ����Ʀ��æ� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1889
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "��צ���� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "������ �� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "������Ʀ����� ������ ��� ���դ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "�������� �� Ц�����դ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "���� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "�� ������ �ͦ���� �ͦ��?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "������� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "������� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "������� ����Ʀ������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "������� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "������� ��������� ������"
 
 #. 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:380
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2548,84 +2603,84 @@ msgstr ""
 #. 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:385
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:850
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* ������ ��� ��� ������ ������� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "������� ��ͦ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "������ �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "��¦����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "������¦����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "������ ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "�������� � �����Φ� ���ڦ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2807,54 +2862,63 @@ msgstr "������:"
 msgid "_Font..."
 msgstr "�����..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "����������� ������"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "����������� ������"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "����������� �������"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "��������� ����Ҧ�"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "�������"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "���������"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "�������"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "�����������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:617
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "������� Ц� ��� ����Φ������� � ����������� ��������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ������� ������� ���������� ���� ��������� � ����"
 
-#: calendar/conduits/todo/todo-conduit.c:725
-#: calendar/conduits/todo/todo-conduit.c:728
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2916,11 +2980,25 @@ msgstr "������� ���צ�����"
 msgid "Factory for the alarm notification service"
 msgstr "������� ��� ������� ���צ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "���������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "��צ���� ���"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
 msgstr "���צ����� �� %s"
@@ -2942,11 +3020,11 @@ msgstr "��� ��� (� ��������)"
 msgid "_Edit appointment"
 msgstr "��������� ����Ҧ�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:671
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "����� �����."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:731
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2954,7 +3032,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:782
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -2965,106 +3043,113 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "�� ������� �Φæ�̦������ GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "�� ������� �������� ������� ���צ�����"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ������� �������� ������� ������� ���צ�����"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-meeting-time-sel.c:410
-#: shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "�� ���������"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "�����դ����"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3075,53 +3160,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "��Ҧ������"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "����'�����"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "�"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "�����"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "������: "
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "����� �������� �����"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "����� �����"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "����� ͦ����"
 
@@ -3137,48 +3224,49 @@ msgstr "���� ͦ�����"
 msgid "Comment contains"
 msgstr "�������� ͦ�����"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "����, �� ͦ����� �������æ� ��� ����Ҧަ �� ��Ħ�"
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "����� ������ ��������"
 
-#: calendar/gui/component-factory.c:631 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "�������� ���� ����Ҧ�"
 
-#: calendar/gui/component-factory.c:632 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "���� ����Ҧ�"
 
-#: calendar/gui/component-factory.c:637 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "�������� ���� ��������"
 
-#: calendar/gui/component-factory.c:638
+#: calendar/gui/component-factory.c:649
 msgid "New _Task"
 msgstr "���� ��������"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ���� צ��������� ��������"
 
@@ -3249,111 +3337,111 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "�������"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "24 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:329
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr " 1 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "��Ħ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr " 1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: 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:378
+#: 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:382
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "��Ħ����� �����"
 
-#: calendar/gui/dialogs/alarm-page.c:386
+#: 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:392
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "��צ���� �������"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: 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:407
+#: 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:412
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ����� �������� ����Ҧަ"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: 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:424
+#: 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:429
+#: 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:454
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:460
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3375,7 +3463,7 @@ msgstr "�����������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -3463,7 +3551,7 @@ msgid "First day of wee_k:"
 msgstr "������ ���� �����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "�'������"
 
@@ -3476,7 +3564,7 @@ msgid "Minutes"
 msgstr "�������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "����Ħ���"
 
@@ -3485,7 +3573,7 @@ msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "������"
 
@@ -3507,7 +3595,7 @@ msgid "Su_n"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "��Ħ��"
 
@@ -3524,7 +3612,7 @@ msgid "Tas_ks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "������"
 
@@ -3545,12 +3633,12 @@ msgid "Time format:"
 msgstr "������ ����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "������"
 
@@ -3622,120 +3710,125 @@ msgstr "���"
 msgid "before the start of the appointment"
 msgstr "����� �������� ����Ҧަ"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�� ������Φ, �� ������ ������ ��������"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "�� ��Ħ� ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "�� �������� ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "��� ���������� ����� ���� ��������."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "�� ��Ħ� ���� �ͦ����."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "�� �������� ���� �ͦ����."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "��� ���������� ����� ���� �ͦ����."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "���������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "���������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "�� ������� �������� �������� �����"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "��������� ����Ҧ�"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "����Ҧ� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���������� ����� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "����� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "���������� ����?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3744,53 +3837,53 @@ msgstr ""
 "���� � æ�� ������ ��� ���դ.\n"
 "���������� ����?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "�������� ��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�� ������Φ, �� ������ ������ �� ��������� ����Ҧ�?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�� ������Φ, �� ������ ������ �� ��������� ��������?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�� ������Φ, �� ������ ������ ��� ���������� ����� � �����̦?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
@@ -3810,25 +3903,25 @@ msgstr "������"
 msgid "Enter Delegate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "����Ҧ�"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Meeting"
 msgstr "��Ӧ�����"
@@ -3848,11 +3941,12 @@ msgid "Classification"
 msgstr "�����Ʀ��æ�"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "���� � ���"
 
@@ -3861,23 +3955,23 @@ msgid "F_ree"
 msgstr "�������"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "��������"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "���̦���"
 
 #: 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 "��������"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "��������:"
 
@@ -3889,15 +3983,20 @@ msgstr "��� ����������:"
 msgid "_Start time:"
 msgstr "���� �������:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "���Ҧ��� ������� ����Φ������."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "���Ҧ��� ���� � ���� צ�צ�����"
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "��������..."
 
@@ -3909,50 +4008,57 @@ msgstr "���צ�������"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Common Name"
-msgstr "���� ����������"
+msgid "Click here to add an attendee"
+msgstr "* ������ ��� ��� ������ ������� *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "������� "
+#, fuzzy
+msgid "Common Name"
+msgstr "���� ����������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "��������"
+msgid "Delegated From"
+msgstr "������� "
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "����"
+msgid "Delegated To"
+msgstr "��������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "����"
+msgid "Language"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr ""
+msgid "Member"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "��¦�����"
 
-#: 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 "����"
 
-#: 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:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -3967,36 +4073,37 @@ msgid "_Change Organizer"
 msgstr "�ͦ���� ����Φ������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "��������� �����"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "��������� �����..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "����� ���������"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 #, fuzzy
 msgid "on"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "on the"
 msgstr "ͦ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 #, fuzzy
 msgid "occurrences"
 msgstr "�������"
@@ -4063,19 +4170,15 @@ msgstr "�������"
 msgid "year(s)"
 msgstr "Ҧ�"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�� ������ �ͦ���� �ͦ��?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4094,7 +4197,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4106,91 +4209,155 @@ msgstr "�Ҧ������:"
 msgid "_Status:"
 msgstr "����:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "����:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "��� �������:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "���Ħ�:"
 
-#: calendar/gui/e-calendar-table.c:937 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1444
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "������ �����Φ ��������"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:943 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 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:945 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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:950
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "��������� �� ��������"
 
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "������ �� ��������"
 
-#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "��������� �������� �� ������Φ"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "������ �����Φ ��������"
 
-#: calendar/gui/e-calendar-table.c:1217
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "������ ��� ������ ��������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:128
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4205,157 +4372,461 @@ msgstr ""
 msgid "Alarms"
 msgstr "���צ�����"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 #, fuzzy
 msgid "Complete"
 msgstr "% ����������:"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "���� ����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "���� ˦���"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "������Ʀ��� ���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "�Ҧ������"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "���� �������"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 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:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "��"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "��"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "���� ������� ��Ħ�"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "������Φ"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "������� �� ����..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "������ �� ����Ҧ�"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "�������� �������� ����"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "������ ��� �������"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "��� ���������� ڦ������:"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "���������� �������æ�"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "��צ����� צ�������"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "��¦� Ħ�"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����̦������ �������æ� ��� �����Ԧ���"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "���������� �������æ�"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "�������� ������� �������æ� ��� ��Ӧ�����"
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "������'������ �������æ�"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "��Ӧ�����"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "��� ���������� ڦ������:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "�������� ������� �������æ� ��� ��Ӧ�����"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "��Ӧ�����"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "��¦� Ħ�"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "������ � ��צ������Φ"
+
+#: calendar/gui/e-itip-control.c:917
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "�������æ�"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "���� �����"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "�������� ������� �������æ� ��� ��Ӧ�����"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "�����צ���"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "��������� �����æ�"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "���������� ��צ��������"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "����̦������ �������æ� ��� �����Ԧ���"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "����̦������ �������æ� ��� �����Ԧ���"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL ��������Ԧ:"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL ��������Ԧ:"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "�������Τ ��צ��������"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "����� ���� ���������� ڦ�������."
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "��������� ��������\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "���� �����צ�"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�� ������� �������� �������� � \"%s\""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "������� צĦ�����!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "������� �� ���� ���� צĦ�����!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4396,208 +4867,213 @@ msgstr "����-����������"
 msgid "date-start"
 msgstr "����-�������"
 
-#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:520
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "������¦����� �������"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "���Ҧ�Φ ��������"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "������'����צ ��������"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "�� ��������"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "����צ�������"
 
-#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:344
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:522
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "���Ҧ���� �������"
 
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "������'������� �������"
 
-#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "�� �������"
 
-#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:530
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "������ Ħ�"
 
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
-#, fuzzy
-msgid "Chair Persons"
-msgstr "������¦����� �������"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
-#: calendar/gui/e-meeting-model.c:1465
-msgid "Required Participants"
-msgstr "���Ҧ�Φ ��������"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
-msgid "Optional Participants"
-msgstr "������'����צ ��������"
-
-#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
-msgid "Non-Participants"
-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:473
-#: calendar/gui/e-meeting-time-sel.c:2024
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:2052 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "�� ������ �Ʀ��"
 
-#: calendar/gui/e-meeting-time-sel.c:412
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "����� �������æ�"
 
-#: calendar/gui/e-meeting-time-sel.c:428
-msgid "_Invite Others..."
-msgstr "��������� �����..."
-
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "���������� ���� ����ަ ������"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-meeting-time-sel.c:496
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "�������� �����Ԧ���"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "������¦�"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "�Ӧ ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "�Ӧ ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:588
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "���Ҧ�Φ ����"
 
-#: calendar/gui/e-meeting-time-sel.c:601
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "���Ҧ�Φ ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:624
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "��� ������� ڦ������:"
 
-#: calendar/gui/e-meeting-time-sel.c:643
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "��� ���������� ڦ������:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "����������� ������� �� %s"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ������� ����������� �������� � \"%s\""
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "�����, ����Ȧ���� ��� ������������ \"%s\", �� Ц�����դ����"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "���� ����Ҧ�..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ������� צ������ ���� � \"%s\""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����Ȧ���� ��� ������������ \"%s\", �� Ц�����դ����"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "����������� ��������� �� %s"
@@ -4658,237 +5134,279 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "���Ҧ��� ���� � ���� צ�צ�����"
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "���Ҧ��� ������� ����Φ������."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "�� ����� ���� צ�צ������� ��Ħ�."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "��������� �������� ������� ������������� ���������"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "���"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "���"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "���"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "���"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "���"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "���"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "�������� ���� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "�������� ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "�������� ͦ���� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "�������� Ҧ� (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "��������"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "����:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "�Ҧ������:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���� ���������:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"������Ҧ�: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "��������:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "����������� ��������"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "�������� �����"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "����������� �������"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "��������� �����"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ���� צ��������� ��������"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -4896,125 +5414,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "�������"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 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:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5039,7 +5557,7 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr "�����æ� �� Ц�����դ����"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5047,7 +5565,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5055,15 +5573,15 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "������Φ��æ� ���"
 
@@ -5078,6 +5596,7 @@ msgid "Unable to process spool folder"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
 #: camel/camel-filter-driver.c:686
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "��������� ��צ�������� %d (%d%%)"
 
@@ -5090,26 +5609,26 @@ msgstr "�¦� �� ��צ������Φ %d"
 msgid "Cannot open message"
 msgstr "��������� צ������ ��צ��������"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "������Φ��æ� ����"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��צ�������� %d � %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�¦� �� ��צ������Φ %d � %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������� ���̦�� Ʀ�����: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������� ��������� Ʀ�����: %s: %s"
@@ -5119,27 +5638,27 @@ msgstr "������� ��������� Ʀ�����: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "������� ��������� Ʀ����������� ������: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "��Ц���������� �����æ�: ��������� ��צ��������: ��� %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "��Ц���������� �����æ�: ����� �� �������: ��� %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "��Ц���������� �����æ�: ����� �� ������Ʀ�������� ���������ަ�: ��� %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "����������� ��צ�������"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5148,7 +5667,7 @@ msgstr ""
 "��������� ������̦������ ��������� �����: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5157,110 +5676,110 @@ msgstr ""
 "������� ��������� ���������� ������: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "�� ������� �������� �����: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:215
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "�� ������� ��������� �����Ϥ���� ������: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ������� �������� ���� ���������� ��� %s: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "�� ������� ������� ���������� �� ��������� fcntl(2): %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�� ������� ������� ���������� �� ��������� flock(2): %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "��������� ����צ���� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "�� ������� צ������ ���� ����� %s: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "�� ������� צ������ ���������� ���� ����� %s: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "�� ������� �������� ����� � ����������� ���̦ %s: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�� ������� �������� �����: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�� ������� ��������� �����Ϥ���� ������: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(��צ���� �������)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "������� ���������� ����� �����: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "������� ������ ����� � ���������� ����: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������� ���������� ����������� ��������� �����: %s"
@@ -5275,86 +5794,86 @@ msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� צ���."
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "��������� �������� ����� �� GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "��������� �������� ����� �� GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�� ������� �������� ���������� ����: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� צ���."
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "��������� �������� ����� �� GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "��������� �������� ����� �� GPG/PGP: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "�� ������� ����������� %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ������� ����������� %s: ����� �Φæ�̦��æ� � ����̦."
@@ -5374,7 +5893,7 @@ msgid "Connection cancelled"
 msgstr "�'������� ���������"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ������� �'�������� � %s (���� %d): %s"
@@ -5384,12 +5903,12 @@ msgid "(unknown host)"
 msgstr "(��צ����� ����)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "�����æ� ���������"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������ ���ަ������ ������ �'�������: %s"
@@ -5487,7 +6006,7 @@ msgid ""
 msgstr "�� ������� �������� �����: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "���ަ������ צ���צ�� צ� ������� IMAP: %s"
@@ -5505,8 +6024,8 @@ msgid "Unknown authentication state."
 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:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "������"
 
@@ -5536,55 +6055,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "�¦� ������ � ��������� ������� ��������: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "����'������: %s"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5630,17 +6149,17 @@ msgstr "�¦� �������������� ��צ��������."
 msgid "Failed to verify certificates."
 msgstr "�¦� ����צ��� �����Ʀ��Ԧ�."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5648,7 +6167,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5663,7 +6182,7 @@ msgstr ""
 "\n"
 "������� �������� �������?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5675,37 +6194,37 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "��������� ������̦������ URL \"%s\""
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "��צ��� ��צ�������� %s � %s"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "����� ������ ��צ��������: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "��������� ������ ����: %s: ��צ��� �����æ�"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "��������� ������ ����: %s: ����� ���ϧ ����"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "��������� ������������� ����: %s: ��צ��� �����æ�"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "��������� ������������� ����: %s: ����� ���ϧ ����"
@@ -5738,52 +6257,52 @@ msgstr "�����צ�� ������ IMAP �� ͦ����� �������æ� ��� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "���ަ������ צ���צ�� OK צ� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ������� �������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ������� ����������� �������� ��� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "���� ���� ������� � �������� �������� �� �����Ҧ."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "����� �ͦ����� ��צ�������."
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "����� ��צ�������� ����� �� ���դ"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "��������� �������æ� ��� ��צ ��צ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "����� ����� ��צ�������"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "�� ������� ������ Ԧ�� ��צ�������� � צ���צĦ �� FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "�� ������� צ������ ���-��������: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�¦� ��������� ��צ�������� %s: %s"
@@ -5796,7 +6315,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:840
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "����"
 
@@ -5814,7 +6333,8 @@ msgstr "����Ԧ� ����"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "����������� Ʀ����� �� ����� ��צ������� � ��æ \"�Ȧ�Φ\" �� ����� �����Ҧ"
+msgstr ""
+"����������� Ʀ����� �� ����� ��צ������� � ��æ \"�Ȧ�Φ\" �� ����� �����Ҧ"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -5828,28 +6348,28 @@ msgstr "��� ���������� �� ���������� ����� �� �������� IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "������ IMAP %s �� Ц�����դ ���������� ���� �����Ʀ��æ� %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "����� Ц������� �����Ʀ��æ� ���� %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �����, ���Ħ�� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5860,91 +6380,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "��צ��� ���� \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "����˦����� ���� �� ������Ѥ ���ͦ���� Ц�����"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "�����צ �������� ������� MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "��� ���������� �������ϧ ����� � �����Ԧ �������� ������Ǧ� MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "�������� צ�����������"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 "��� ��������� �������ϧ ����� � ������������ ������������ � �����Ԧ mbox."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "����������� Ʀ����� �� ����� ��צ������� � ��æ \"�Ȧ�Φ\""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "�����צ �������� ������� maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "��� ���������� �������ϧ ����� � �����Ԧ �������� ������Ǧ� maildir."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "��������Φ ����������ަ Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "��� ���������� �� ���������� �������ϧ ����� � ����������� ��������������� "
 "������ mbox."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" �� � ��������� ������."
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� �������ϧ ����� %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ���� \"%s\" �� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ������� ������ ���� �������� ���� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������ ��������� ���� ���� \"%s\": %s"
@@ -5955,27 +6477,27 @@ msgid "Could not save summary: %s: %s"
 msgstr "�� ������� �������� �������� %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "��������� ������ ��צ�������� �� ��������: ������� ��צ����"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "���ͦ���� ��������� ��צ�������� � maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "��������� ������ ��צ�������� � ��� maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -5984,20 +6506,20 @@ msgstr ""
 "��������� �������� ��צ��������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "��צ��� ��צ��������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "��צ���� �ͦ�� ��צ��������"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6006,15 +6528,15 @@ msgstr ""
 "�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� \"%s\" �� ���դ."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6023,19 +6545,19 @@ msgstr ""
 "�� ������� �������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" �� � ��������� Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ������� ������ ���� \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "������� �� Maildir"
 
@@ -6050,33 +6572,33 @@ msgstr "�� ������� ������������ ���� \"%s\": %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "��������� צ������ ������� ��������: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "��������� צ������ ������� ��������: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "��������� ����� צ�ͦ����"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "��������� ������ ��צ�������� �� ����� Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6085,17 +6607,17 @@ msgstr ""
 "��������� �������� ��צ�������� \"%s\" � ���� \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "����� ���� ���������� ڦ�������."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�¦� �������� ��צ��������: ڦ������� ������� ��������?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6104,7 +6626,7 @@ msgstr ""
 "�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6113,14 +6635,14 @@ msgstr ""
 "�� ������� �������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" �� � ��������� ������."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6129,110 +6651,110 @@ msgstr ""
 "�� ������� ������ ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "���� \"%s\" �� �������. �� ������."
 
 #. 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-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "���������� ����"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�� ������� צ������ ���� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "�������� ������� ��������� ���̦������ �� ����æ� %ld � ��æ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ������� צ������ ���� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ������� צ������ ��������� ������� ��������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "�������� � ���� �� �Ц��������, ��צ�� Ц��� ������Φ��æ�"
 
-#: camel/providers/local/camel-mbox-summary.c:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������� ������ � ��������� ����� ��������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�¦� ������ � ��������� ������� ��������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ������� ������� ��Ȧ��� ���� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ������� ������� ��������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "��צ���� �������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "���ͦ���� ��������� ��צ�������� � MH"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "��������� ������ ��צ�������� � ���� MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" �� � ���������."
@@ -6242,245 +6764,245 @@ msgstr "\"%s\" �� � ���������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "��������� צ������ ������� MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "��������� ������ ��צ�������� �� ����� Mbox: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "\"%s\" �� � ��������� ������."
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� \"%s/%s\" �� ���դ."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "������������� ���� ����� %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "������������Φ ���� �� ����� ���������������"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "������������Φ ���� �� ����� ��������"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ������� ������������ ��������� ���� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�� ������� ������������ �������������� ���� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, 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:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "�� ������� ����������� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "������ צ������ ��'� �����������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "�� ������� צĦ����� ��'� ����������� �� ������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "������ צ������ ��'� ����������� � ������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "��צ�������� %s �� ��������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "�� ������� �������� ���� ���� � �������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "�� ������� ����������� ������ ���� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "������ USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "�� ������� צ������ ������� ������� �����: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "������ USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "�� ������� צ������ �� �������� ���� .newsrc ��� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "��������� POP-��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "�������� ����� ��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr "�� ������� צ������ ����: ������ ��צ������� �� ������."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "������ �����Φ ��צ��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "�� ������� �������� ��צ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "����� ��צ�������� � UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� ��צ�������� POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "��������� ��צ��������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "�������� ��צ�������� �� �����Ҧ"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "������� �� ���������� %s ��"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "��� �'������� �� ����������� ����� � �����Ҧ� POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "�� ������� �������Ʀ�������� �� �����Ҧ KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "�� ������� �'�������� � ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "�� ������� �'�������� � �������� POP �� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s���� �����, ���Ħ�� ������ POP3 ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 #, fuzzy
 msgid "(Unknown)"
 msgstr "��צ���� �������"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6489,193 +7011,193 @@ msgstr ""
 "��������� �'�������� � �������� POP.\n"
 "������� צ�������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��צ��� ���� \"%s\"."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "���ަ������ צ���צ�� צ� ������� IMAP: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "�� ������� �������� ����� �� sendmail: %s: ����� �� צĦ�����"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�� ������� ����������� sendmail: %s: ����� �� צĦ�����"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�� ������� צĦ����� ��צ��������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ���������� �ɭ����� %s: ����� �� צĦ�����."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "�� ������� �������� %s: ����� �� צĦ�����."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ���������� � ������ %d: ����� �� צĦ�����."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "�� ������� ������ ������ צ��������� � ��צ������Φ"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 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:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "����������� �������, ������� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "����������� ������� � ���������� �� �ҭ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "������� �� ���̦������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "�������� ������� �� ���̦������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "��צ����� ��צ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "������� ������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "������� �������� ����� ������ަ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "������� �� ��������, �������� ������ ������ަ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "�������� ������� Ħ� ��Ц��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "�¦� �������æ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "�����Ʀ��æ���� ����Φ�� ����� �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "���������� �¦� �����Ʀ��æ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "����������� �����Ʀ��æ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6683,125 +7205,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "������ SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "���������� ����� SMTP ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� צ���."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "���������� ��צ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "���צ����� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "���������� ��� �ަ������� צ���צĦ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������� צ���צĦ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "�����Ʀ��æ� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "������� ��������� �����Ʀ��æ����� ��'���� SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "���������� ��� �ަ������� צ���צĦ �� AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "�¦� ������ AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "��צ��� �����Ʀ��æ�� צ���צ�� צ� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "�������� צ���צĦ �� MAIL FROM: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "������� צ���צĦ �� MAIL FROM: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "�������� צ���צĦ �� RCPT TO: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "������� צ���צĦ �� RCPT TO: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "�������� צ���צĦ �� DATA: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "������� צ���צĦ �� DATA: %s: ����� �� צĦ�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "�������� צ���צĦ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "������� צ���צĦ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "�������� צ���צĦ �� QUIT: %s: ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "������� צ���צĦ �� QUIT: %s: ����������"
@@ -6933,7 +7455,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6942,44 +7464,44 @@ msgstr ""
 "������� ���������� �����: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "�������� ��..."
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "������������!"
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "���� ���դ, ����������?"
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������� ���������� �����: %s"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������� ������������ �����: %s"
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������� ������� �� �����: %s"
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "��������� �������� ��צ�������� צ� ���������"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6988,7 +7510,7 @@ msgstr ""
 "��������� �����æ��������� � ���̦: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6997,7 +7519,7 @@ msgstr ""
 "��������� ��Ҧ���� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7006,42 +7528,42 @@ msgstr ""
 "������� �������������� �����: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�����: �ͦ���� ��צ��������"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "���������� ��צ��������"
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7049,17 +7571,17 @@ msgstr ""
 "�� ������� �������� צ��� ���������:\n"
 "��������� ���������� ��������� HTML-���������."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "�� ������� �Φæ�̦������ ��������� Evolutuion."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:84
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7108,15 +7630,24 @@ msgstr "���� ͦ�����"
 msgid "Subject does not contain"
 msgstr "���� �� ͦ�����"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "�����'����� ��� ������"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H:%M"
 
@@ -7167,30 +7698,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7322,22 +7853,22 @@ msgstr "��Ħ"
 msgid "Add action"
 msgstr "������ Ħ�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "��¦� ����"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "���Ħ�� URI ����"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<������ ��� ��� ������ ����>"
 
@@ -7354,39 +7885,39 @@ msgstr ""
 msgid "Test"
 msgstr "����"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "����� �������: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "����"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "���� �Ӧ צ���צ�Ϥ �Ӧ� �����Ҧ��"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "���� צ���צ��� ����-����� �����Ҧ�"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "������ �����Ҧ�"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "�Ȧ�Φ"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "��Ȧ�Φ"
 
@@ -7584,7 +8115,7 @@ msgstr "�����צ��� �Ӧ�"
 msgid "Score"
 msgstr "��¦�����"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "����������"
 
@@ -7618,7 +8149,7 @@ msgstr "����������� ��"
 msgid "Stop Processing"
 msgstr "�������� �������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -7631,15 +8162,15 @@ msgstr "���� �����"
 msgid "was before"
 msgstr "���� ���"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "������ �������"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "�ͦ���� �������"
 
@@ -7648,42 +8179,42 @@ msgstr "�ͦ���� �������"
 msgid "Score Rules"
 msgstr "��¦�����"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ������դ ���� ����� � Elm"
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "������������..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "���� �����, ���������"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "������������ %s �� %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "���������� %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:95
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "�����"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7691,19 +8222,15 @@ msgstr ""
 "Evolution ������� �����צ ����� Elm\n"
 "�� ������� �� ����������� �� � Evolution?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "������� �����"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7711,23 +8238,23 @@ msgstr ""
 "Evolution ������� ����� GnomeCard.\n"
 "�� ������� �� ����������� �� � Evolution?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ������դ ��ۦ ���Ҧ ��Φ Netscape"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "���������� ��������"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "������� ������������"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7735,11 +8262,11 @@ msgstr ""
 "Evolution ������� �����צ ����� Netscape.\n"
 "�� ������� �� ����������� �� � Evolution?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution ������դ ��ۦ ���Ҧ ��Φ Pine"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7747,7 +8274,7 @@ msgstr ""
 "Evolution ������� �����צ ����� Pine.\n"
 "�� ������� �� ����������� �� � Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -7784,68 +8311,68 @@ msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 msgid "Mail configuration interface"
 msgstr "��������� ���Ʀ����æ� �����"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "����, �� ͦ����� �����"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "���� ���Ҧ����� ����� (����Ҧ���)"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "����������� �ͦ����"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "���������� ���� �ͦ�����"
 
-#: mail/component-factory.c:124
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "�������� ����� ��������"
 
-#: mail/component-factory.c:142
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "�� ���� �� ���� ͦ����� ��צ��������."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "���������Ԧ..."
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "�ͦ���� ���������Ԧ æ�� ����"
 
-#: mail/component-factory.c:746
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "���� ������� ��צ��������"
 
-#: mail/component-factory.c:909
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "���� ������� ��צ��������"
 
-#: mail/component-factory.c:933
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#: mail/component-factory.c:942
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#: mail/component-factory.c:948
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#: mail/component-factory.c:1113
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -7858,170 +8385,175 @@ msgstr "���������Ԧ ��� \"%s\""
 msgid "Properties"
 msgstr "���������Ԧ"
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��������� �������� ���������� �������: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d ���������"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "d �������"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d �� צĦ�����"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d צĦ�����"
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d ������"
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�������� ������� � ��צ��������"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "���������� ���� ����"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "���������� ���� צ���������"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "���������� ���� ��������ަ�"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "����� ������ ����������"
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "����� ����"
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "����� צ���������"
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "����� ��������ަ�"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "����� ������ ��������"
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "��������� �� ���� ��צ��������..."
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "�������� ��..."
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "���������"
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "�����צ��� צ���������"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "�����צ��� � ������"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "�����צ��� �Ӧ�"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "��������� ����������"
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "��������� ������������"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "��������� �� �������"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "��������� �� ���������"
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "��������� � ����..."
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "�������� � ����..."
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "���������"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "������ צ��������� � ������� �����"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "����������� Ʀ�����"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "�������� ������� � ��צ��������"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "����� ������ ����������"
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "���������� ���� ������ ����������"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "����� ������ ���������� (%s)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "���������� ���� ������ ���������� (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "������"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "��������� �������æ� ��� ����"
@@ -8113,7 +8645,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8130,52 +8662,52 @@ msgstr "��������"
 msgid "Enable"
 msgstr "�צ������"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������Φ, �� ������ ������ ��� �������?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "�� �������"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "�����Ħ ������ �������?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "�� ������Φ, �� ������ ������ æ ��צ �������?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "��������� �����"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "����� �� %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "���� - %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "����� צ� %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "������ �������� %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "������ ������� Ʀ����������"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8183,34 +8715,34 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "��Ħ����� �������?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8218,58 +8750,58 @@ msgstr ""
 "�� ��צ�������� �� ��� ����.\n"
 "�����Ħ צĦ�����?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "�� ��צ�������� ͦ����� ��צ���� ��������ަ�:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "��צ����� צ�������"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "��������� ��צ�������� �"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "���Ц����� ��צ�������� �"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� ������Φ, �� ������ ��������� �Ӧ %d ��צ�������?"
 
-#: mail/mail-callbacks.c:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8277,7 +8809,7 @@ msgstr ""
 "�� ������ ���� ���������� �������Φ\n"
 "��צ�������� � ��æ \"��������\"."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8285,28 +8817,28 @@ msgstr ""
 "�� ������ ���� צĦ����� ��������\n"
 "��צ�������� � ���� \"��Ħ���Φ\"."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� ������Φ, �� ������ צĦ����� �������� �Ӧ %d ��צ�������?"
 
-#: mail/mail-callbacks.c:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "����� �������� ��צ�������"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "�������� ��צ�������� ��..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "�������� ��צ�������� ��..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8314,31 +8846,31 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "����� �� ���������� �� ��צ��������."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "������� ������������ �����: %s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "����������� ��צ��������"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "�� ������� ����������� ��צ��������"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ�"
@@ -8380,11 +8912,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "�������æ� Evolution"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�������"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8393,6 +8930,14 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "�Ȧ�Φ"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
@@ -8502,7 +9047,7 @@ msgstr "�����������"
 msgid "Done"
 msgstr "������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "��������"
 
@@ -8510,7 +9055,8 @@ msgstr "��������"
 msgid "E_nable"
 msgstr "�צ������"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:104
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "���������..."
 
@@ -8651,6 +9197,7 @@ msgid "Sending Mail"
 msgstr "���������� �����"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "��Ħ�����"
 
@@ -8908,25 +9455,25 @@ msgstr "��������"
 msgid "External Viewer"
 msgstr "������ �������� ���������"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "������������ �ͦ��� ��צ��������"
 
-#: mail/mail-display.c:1614
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "�������� ��������� � ������Ҧ"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1619
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "�������"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "��������"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "�������� ���������� ��..."
 
@@ -8943,32 +9490,49 @@ msgstr ""
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "��צ��� ������"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "�����צ���� ��"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -8998,58 +9562,58 @@ msgstr "���ڦ���� �� ��צ��ͦ ���Φ�Φ ��Φ (���� \"%s\")"
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "�������Ʀ��������� ����"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, 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:723
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: mail/mail-local.c:769
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "�� ������� ������ ���� \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 "��������� �������� ��צ�������� \"%s\" � ���� \"%s\"\n"
 "  %s"
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "���Ʀ�������� ����"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9058,7 +9622,7 @@ msgstr ""
 "������� � ��� \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9067,7 +9631,7 @@ msgstr ""
 "������� Ц� ��� �Ħ������� �����æ�:\n"
 "%s"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "������"
 
@@ -9079,49 +9643,44 @@ msgstr "����������� ����"
 msgid "Fetching Mail"
 msgstr "��������� �����"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "�������, ��צ�������� ���� ��Ц��� צĦ�����."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "���������� \"%s\""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "���������� ��צ�������� %d � %d"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "�¦� �� ��צ������Φ %d � %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 #, fuzzy
 msgid "Complete."
 msgstr "% ����������:"
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "���������� ��צ�������� � ��æ"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��צ������� � %s"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "��Ц������ ��צ������� � %s"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "��������� �������� ���� \"%s\" � ���� ����"
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "�����������"
@@ -9135,6 +9694,12 @@ msgstr "��������"
 msgid "Scanning folders in \"%s\""
 msgstr "���������� ��� � \"%s\""
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "���������"
+
 #: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "�������Φ ��צ��������"
@@ -9230,75 +9795,75 @@ msgstr "���������������� �'������� � %s"
 msgid "_Search"
 msgstr "�����"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(��������� ��צ��������)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "��������� ��צ��������"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "�����Τ ��צ��������"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "������ � ��צ������Φ"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "�ŭ������� �����צ���"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "����� ������"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "������:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "����������..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������: %s, ���: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "����: %s, ���: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "���: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "��Ħ����� � �������� �����"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "��������� ���"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "���������..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "�ަ�������..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "���ͦ����."
 
@@ -9306,15 +9871,6 @@ msgstr "���ͦ����."
 msgid "User canceled operation."
 msgstr "���������� �������� �����æ�."
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr "�����'����� ��� ������"
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9324,30 +9880,30 @@ msgstr "���Ħ�� ������ ��� %s"
 msgid "Enter Password"
 msgstr "�צ� ������"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��������� ��צ�������� %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "��������� ��צ��������"
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "��������� ��צ��������"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "����������� ���� %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� ��� � \"%s\""
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9356,16 +9912,21 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "����"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "����������� צ�������ϧ ����"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "���� צ�������� ����"
 
@@ -9436,7 +9997,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "��������� ������ ��צ�������"
 
@@ -9472,16 +10033,16 @@ msgstr "������������ ���� \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "���ͦ���� ���������� �� ���� \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "����"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "�� ���� ������� �������"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "���� �����, ����Ҧ�� ������."
 
@@ -9521,89 +10082,91 @@ msgstr "��������� ����������"
 msgid "Evolution component for the executive summary."
 msgstr "��������� Evolution ��� ����������� ��������."
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "����, �� ͦ����� �������� Evolution"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
 msgstr "�� ������� �Φæ�̦������ ��������� �������� Evolutuion."
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "����Ҧަ"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "����� ����Ҧ���"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "������� ��������"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "����� ��� �� Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "��'�:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "��������� ��������"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "������� ������������ RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "���� ����"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "����� �������"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(��� �����)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>�� ������� �'�������� � �������� ������</b></dd>"
 
@@ -9611,35 +10174,63 @@ msgstr "<dd><b>�� ������� �'�������� � �������� ������</b></dd>"
 msgid "Weather"
 msgstr "������"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "�ŭ����"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "����������� ��������"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "�¦� ����� ��������"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): �� ������� �Φæ�̦������ Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "�F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "�C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "������"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "�����������"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "������"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "������"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "���������"
@@ -10935,33 +11526,47 @@ msgstr "������"
 msgid "The Evolution shell."
 msgstr "�������� Evolutuion."
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "�������� �������æ"
 
-#: shell/e-activity-handler.c:203
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "��������� �����æ�"
 
-#: shell/e-setup.c:125
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "�Ȧ�Φ"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "���æ���Φ ����"
+
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "�������æ� Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "�����Φ�� \"������\" ��� ���������� �����, �� \"���ͦ����\" ��� �����."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "�� ������� �������� �������� �����"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -10972,14 +11577,14 @@ msgstr ""
 "%s\n"
 "�������: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "������� ������� � ��� ���������� �����."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -10987,7 +11592,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -10996,7 +11601,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11004,6 +11609,19 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "��������� ��������� ���� � ����."
@@ -11068,10 +11686,16 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "������������� ���� \"%s\" ��:"
 
-#: shell/e-shell-folder-commands.c:539
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "������������� ����"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "������� ����� ���� �� צ���: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11081,50 +11705,29 @@ msgstr ""
 "��������� �������� ������� ����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "�� ������� ����� ����."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "����� ���� �� ���� ͦ����� ������ �����."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "���� �� ���� ͦ����� ���Ħ����� ������Ǧ�."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" � \"..\" � ��������������� ������� ���."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "������� ����� ���� �� צ���: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ��������� ���ϧ ����"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "�����..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(��������������)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11133,13 +11736,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 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:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11150,7 +11753,7 @@ msgstr ""
 "�������� �� �������.\n"
 "�ަ������� 5 ������ �� צ���צ��."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11159,27 +11762,27 @@ msgstr ""
 "������������ %s\n"
 "������������ �������� %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "����� %s �� ���դ"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "����� ���ϧ �����������æ� �� %s."
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "������������"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11188,96 +11791,118 @@ msgstr ""
 "������������ %s.\n"
 "������ %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "������� ������� %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "������� ������������ %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "����� �����:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "������� ����"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "��� �����:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "����������� ��Φ � ��������� � ���Ҧ��� �������"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "������ ������ �����"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "��� %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "������� ����"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr "������� ���� ����������� ��� ������� ��� �����"
 
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "������"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "�������� �'������..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
+#: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
-"%s"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "�� ������� ����� ����."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "����� ���� �� ���� ͦ����� ������ �����."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "�� ���� �� ���� ͦ����� ��צ��������."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "\".\" � \"..\" � ��������������� ������� ���."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� �������� �� ������ �������� � $PATH."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "�� ������� ��������� Bug buddy"
 
@@ -11311,11 +11936,15 @@ msgid "Error executing %s."
 msgstr "������� ��������� %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "������ �� ̦Φ�"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "��������� �� �� ̦Φ�"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "������ �� �� ̦Φ�"
 
@@ -11323,45 +11952,35 @@ msgstr "������ �� �� ̦Φ�"
 msgid "(No folder displayed)"
 msgstr "(����ϧ ���� �� צ���������)"
 
-#: shell/e-shell-view.c:1588
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1590
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(�����)"
 
-#: shell/e-shell-view.c:1595
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1597
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1637
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1644
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1650
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1656
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11369,35 +11988,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1879 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "������"
-
-#: shell/e-shell.c:1881
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "��צ�Φ �ҭ������"
 
-#: shell/e-shell.c:1883
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "��������� ��������������� �� OAF"
 
-#: shell/e-shell.c:1885
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "�� �������� ���Ʀ����æ��ϧ ���� �����"
 
-#: shell/e-shell.c:1887 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "�������� �������"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "�������� ���� ����� ����˦�"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "����� �����:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11406,115 +12021,111 @@ msgstr ""
 "�� �����Ħ ������� �������� �����\n"
 "\"%s\" � ����̦ ����˦�?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "�� ��������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "������������� ����� ����˦�"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "������������� ������� ����� ����˦� ��:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "��̦ Ц��������"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "���������� ����˦ �� ��̦ Ц��������"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "���������� ����˦ �� ����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "���� �����..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "�������� ���� ����� ����˦�"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "�������� �� �����..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "�������� �� ����� ����˦�"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "������������� �� �����..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "������������� �� ����� ����˦�"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "�������� ������ ����˦�"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "�������� ������ ����˦�"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "������������� �����"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "������������� �������� ����� ��:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "�������� ����, �� ��'����� � ��� �������"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "�������� � ������ צ�Φ"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "�������� ����, �� ��'����� � ��� �������, � ������ צ�Φ"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "�������������"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "������������� ��� �����"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "��������"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�������� ��� ����� � ����̦ ����˦�"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "������� ���������� ����˦�."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "������"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "�Ȧ�Φ"
-
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11523,133 +12134,133 @@ msgstr ""
 "�� ������� ������ ���� \"%s\":\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(��� �����)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "��� �������"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "���� � æ�� ������ ��� ���դ"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "�������� ��� ���� �� צ����"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "������� �����/������"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "�� �������� ͦ��� ��� ��������� ����"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "���� �� �������"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "������ϧ ���� �� ��������"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "�����æ� �� Ц�����դ����"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "������� ���� �� ����� �ͦ���� �� ��������"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "��������� �������� ���� � � ������"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
-#, fuzzy
+#: shell/e-task-widget.c:196
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% ����������:"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "������� CORBA"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "��צ���� �ҭ�����"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "��� ��� ��������"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "�� ��� ��������"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "�� ��������"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "������������� ���"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "������������ �����"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "��Ц���������� �����æ�"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "����Ҧ��� �������"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "���դ"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "��צ���� URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "��� �����"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "�� ���������� צ������ ��������"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "������� �������� �������"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -11660,7 +12271,7 @@ msgstr ""
 "\n"
 "��צ���� �������"
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -11673,7 +12284,7 @@ msgstr ""
 "������� צ� ����������ϧ �������:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -11776,70 +12387,68 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "���������"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "�� �����������"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "����� �� ����������"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ���� ����������� ��Φ � ����� ���̦�:"
 
-#: shell/main.c:90
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ������դ ������..."
 
-#: shell/main.c:194
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:215
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-
-#: shell/main.c:269
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��������� ��'������� � ��������� Ximian Evolutuion."
 
-#: shell/main.c:278
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "��������� �Φæ�̦������ �������� Ximian Evolutuion: %s"
 
-#: shell/main.c:348
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "�������� ��������"
 
-#: shell/main.c:349
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:391
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ������� �Φæ�̦������ ����������� ������� Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "������� ������������ �����: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "�������� ����"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "�������� ����"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "�� ������� ����� ����."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12124,11 +12733,12 @@ msgstr "���������..."
 
 #: 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:237
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "��������"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "�������� �� �������"
 
@@ -12144,7 +12754,7 @@ msgstr "�������� ��� ������� �� �����"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "����"
@@ -12166,7 +12776,7 @@ msgstr "�������� ������� � ������� Ħ����"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "��������"
 
@@ -12226,10 +12836,6 @@ msgstr "����������� ��Ӧ����� ��� ����� ��������"
 msgid "Customise My Evolution"
 msgstr "����������� ͦ� Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "���������"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "��������� ������� ������� �����æ�"
@@ -12797,7 +13403,7 @@ msgstr "������� �� צ���"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "�������"
@@ -12828,7 +13434,8 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "����������� �� ��צ�������� ����� �����Ʀ����� ���������� S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "������"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -12880,7 +13487,7 @@ msgid "Save in folder..."
 msgstr "�������� � ��æ..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "�������� �������� ����"
 
@@ -12976,7 +13583,7 @@ msgid "_From Field"
 msgstr "���� \"���\""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "��������"
 
@@ -12993,7 +13600,7 @@ msgstr "�����צ���� ��:"
 msgid "_Security"
 msgstr "�������"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "��צ���"
 
@@ -13229,10 +13836,6 @@ msgstr "�����"
 msgid "_Shortcut Bar"
 msgstr "������ ����˦�"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "��������� �� �� ̦Φ�"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "�ͦ���� ��������� ��������"
@@ -13317,117 +13920,127 @@ msgstr "��������� צ����������"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "�������"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "�����"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "������Φ"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "��� ��� ���� � ������ �����Ԧ: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�������� צ������ ��� ���� ͦ� 0 �� 100, �������"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "���Ԧ������"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "���������Ϥ�����������"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "����������"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "����̦����"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "����������"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "��Ȧ��Ϥ�����������"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "��������"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "���������"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "�����������"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "�����"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "��צ����� ��¦� �����̦�: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "���Ħ�� ������� ��¦� �����̦�"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "�����..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "��������� �����̦�"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "�������� ����˦�"
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "�������� �����"
 
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "�������� �����"
+
+#: widgets/misc/e-filter-bar.h:96
+#, fuzzy
+msgid "Clear"
+msgstr "��������"
+
 #: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "�������� ���"
@@ -13453,11 +14066,11 @@ msgstr "��צ��������"
 msgid "Don't show this message again."
 msgstr "����� �� ���������� �� ��צ��������."
 
-#: widgets/misc/e-search-bar.c:335
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:461
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "������ �����"
 
@@ -13471,14 +14084,35 @@ msgstr "������������ ������ ������ϧ �����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "������������ ����������� ������; ���������� �������"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ������� �Φæ�̦������ GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ������� �Φæ�̦������ GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� �Φæ�̦������ Bonobo"
+
+#~ msgid "_Invite Others"
+#~ msgstr "��������� �����"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "��������� �������� ���� \"%s\" � ���� ����"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "���� �� ���� ͦ����� ���Ħ����� ������Ǧ�."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid "F_ormat"
+#~ msgstr "������"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7611a74b4..048093af26 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.13\n"
-"POT-Creation-Date: 2001-10-28 08:09+0800\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-28 10:05+0800\n"
 "Last-Translator: Wang Li <charlesw1234@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -30,291 +30,296 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "�� VCard �ļ����� Evolution"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "�����ʼ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 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:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "��ҵ"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "��˾"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "��˾"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "��ͥ"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "��֯"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "��֯"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "�ֻ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "��ҵ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "��ҵ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "��ͥ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "��ҵ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "��ҵ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "��ͥ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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:1601
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "�紫"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:475
-#: addressbook/gui/contact-editor/e-contact-editor.c:1632
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "�����ʼ� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:485
-#: addressbook/gui/contact-editor/e-contact-editor.c:1633
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "�����ʼ� 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "��վ"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "�칫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "�칫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "ͷ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "ְҵ"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "ְҵ"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "�º�"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "�º�"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "��ż"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "���� URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "���� URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "� URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "� URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "��Ƭ��"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -322,7 +327,7 @@ msgstr ""
 "\n"
 "���ƣ�"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -330,31 +335,31 @@ msgstr ""
 "\n"
 "  ���     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -362,7 +367,7 @@ msgstr ""
 "\n"
 "���գ� "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -370,7 +375,7 @@ msgstr ""
 "\n"
 "��ַ��"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -378,13 +383,13 @@ msgstr ""
 "\n"
 "  ���䣺   "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -392,7 +397,7 @@ msgstr ""
 "\n"
 "  �ֵ���      "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -400,7 +405,7 @@ msgstr ""
 "\n"
 "  ����        "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -408,7 +413,7 @@ msgstr ""
 "\n"
 "  ����      "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -416,7 +421,7 @@ msgstr ""
 "\n"
 "  �������룺 "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -424,13 +429,13 @@ msgstr ""
 "\n"
 "  ���ң�     "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -438,7 +443,7 @@ msgstr ""
 "\n"
 "�绰��\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -446,7 +451,7 @@ msgstr ""
 "\n"
 "�绰��"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -454,7 +459,7 @@ msgstr ""
 "\n"
 "�����ʼ���\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -462,13 +467,13 @@ msgstr ""
 "\n"
 "�����ʼ���"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -476,7 +481,7 @@ msgstr ""
 "\n"
 "ʱ����"
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -484,13 +489,13 @@ msgstr ""
 "\n"
 "����λ�ã�"
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -498,7 +503,7 @@ msgstr ""
 "\n"
 "��֯��"
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -506,37 +511,37 @@ msgstr ""
 "\n"
 "  ���ƣ�  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -552,23 +557,23 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "��� VCard"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -577,10 +582,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:1509
+#: addressbook/conduit/address-conduit.c:1537
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1424
-#: calendar/conduits/todo/todo-conduit.c:1126
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
 #: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -588,7 +593,7 @@ msgid "Could not initialize Bonobo"
 msgstr "�޷���ʼ�� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "����..."
 
@@ -601,35 +606,35 @@ msgstr "װ��..."
 msgid "Error in search expression."
 msgstr "��������ʽ����"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "�������� LDAP ������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "�޷����� LDAP ��������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "���ڵȴ��� LDAP ������������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "���ڽ���Ƭ���ӵ� LDAP ������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "���ڴ� LDAP ������ɾ����Ƭ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "�����޸� LDAP �������ϵĿ�Ƭ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "���ڽ��� LDAP ���������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "��ʼ������"
 
@@ -641,20 +646,20 @@ msgstr "�޷�װ����\n"
 msgid "EBook not loaded\n"
 msgstr "û��װ�� EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1066
-#: calendar/conduits/calendar/calendar-conduit.c:966
-#: calendar/conduits/todo/todo-conduit.c:691
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "�޷����� wombat ������"
 
-#: addressbook/conduit/address-conduit.c:1067
-#: calendar/conduits/calendar/calendar-conduit.c:967
-#: calendar/conduits/todo/todo-conduit.c:692
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "�޷����� wombat"
 
-#: addressbook/conduit/address-conduit.c:1097
-#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "�޷��������Ա�ĵ�ַӦ�ó����"
 
@@ -699,8 +704,9 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:71
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "��ϵ��"
 
@@ -812,8 +818,8 @@ msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
-"���� LDAP "
-"�������ø���Ϣ��ȷ����������ʹ���Ǹ��ڵ㡣��������ѯ���ķ���������Ա��"
+"���� LDAP �������ø���Ϣ��ȷ����������ʹ���Ǹ��ڵ㡣��������ѯ���ķ���������"
+"Ա��"
 
 #: addressbook/gui/component/addressbook-config.glade.h:19
 msgid ""
@@ -853,7 +859,7 @@ msgstr "����(A)"
 #: 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-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "(_e)�༭"
@@ -871,15 +877,20 @@ msgid "_Server name:"
 msgstr "(_s)����������"
 
 #: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:105
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:465
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "��ϵ��"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�޷��򿪵�ַ��"
 
-#: addressbook/gui/component/addressbook.c:474
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -889,7 +900,7 @@ msgstr ""
 "�������˴���� URI����������Ϊ\n"
 " LDAP �������Ѿ��ر�"
 
-#: addressbook/gui/component/addressbook.c:479
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -901,7 +912,7 @@ msgstr ""
 "�������ڴ��������Ӵ���ȡ�˳����\n"
 " CVS Դ����֮��������\n"
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -909,81 +920,92 @@ msgstr ""
 "�����޷��򿪸õ�ַ���� ����·���Ƿ����\n"
 "�Լ����Ƿ����㹻��Ȩ�޷�������"
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ϊ %s (�û� %s)�������"
 
-#: addressbook/gui/component/addressbook.c:757
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:760
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "�����"
 
-#: addressbook/gui/component/addressbook.c:758
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "���ƺ���"
 
-#: addressbook/gui/component/addressbook.c:759
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "�����ʼ�����"
 
-#: addressbook/gui/component/addressbook.c:760
-#: calendar/gui/cal-search-bar.c:58
+#: addressbook/gui/component/addressbook.c:763
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "�߼�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
-#: calendar/gui/cal-search-bar.c:411
+#: addressbook/gui/component/addressbook.c:1005
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "�ļ������������ʾ�� URI"
 
-#: addressbook/gui/component/e-address-popup.c:465
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(���)"
+
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "���õ����ʼ�"
 
-#: addressbook/gui/component/e-address-popup.c:578
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "ѡ��һ��"
 
-#: addressbook/gui/component/e-address-popup.c:584
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "��������ϵ�ˡ�%s��"
 
-#: addressbook/gui/component/e-address-popup.c:596
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Ϊ���е���ϵ�ˡ�%s�����ӵ�ַ"
 
-#: addressbook/gui/component/e-address-popup.c:882
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "��ѯ��ַ��..."
 
-#: addressbook/gui/component/e-address-popup.c:958
+#: addressbook/gui/component/e-address-popup.c:973
 #: addressbook/gui/component/e-address-widget.c:387
 #: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "�༭��ϵ����Ϣ"
 
-#: addressbook/gui/component/e-address-popup.c:988
+#: addressbook/gui/component/e-address-popup.c:1003
 #: addressbook/gui/component/e-address-widget.c:423
 #: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "���ӵ���ϵ��"
 
-#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "�ϲ������ʼ���ַ"
 
@@ -1004,9 +1026,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "��ַ������ѡ����泵��"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:765
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "ɾ��"
 
@@ -1035,7 +1057,7 @@ msgstr "(%d δ��ʾ)"
 msgid "Unnamed Contact"
 msgstr "δ��������ϵ��"
 
-#: addressbook/gui/component/select-names/e-select-names.c:523
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1051,7 +1073,15 @@ msgstr ""
 " Jon Trowbridge <trow@ximian.com>��\n"
 "лл��"
 
-#: addressbook/gui/component/select-names/e-select-names.c:601
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "�ӵ�ַ����ѡ����ϵ��"
 
@@ -1111,7 +1141,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "��ϵ�˱༭��"
 
@@ -1183,8 +1213,8 @@ msgstr "(_c)��ϵ��..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:701 filter/filter.glade.h:8
-#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1243,36 +1273,43 @@ msgid "_Web page address:"
 msgstr "(_w)��ҳ��ַ��"
 
 #: 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 "��ȷ����ϣ��ɾ�����ޱ�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "ɾ����ϵ�ˣ�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:753
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "����ϵ��������Щ���룺"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2229
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�޷�Ϊ���ҵ���������%s��"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "����������ϵ��"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "ȫ��"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "�����ʼ�"
 
@@ -2352,7 +2389,7 @@ msgid "contact-list-editor"
 msgstr "��ϵ���б��༭��"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "��ϵ���б��༭��"
 
@@ -2402,7 +2439,7 @@ msgstr ""
 "��һ��Ҫ������"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "�߼�����"
 
@@ -2426,9 +2463,9 @@ msgstr "%d �ſ�Ƭ"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:1406
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "����Ϊ VCard"
@@ -2439,18 +2476,18 @@ msgid "Open"
 msgstr "��"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "ת����ϵ��"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "����ϵ�˷��ʼ�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2458,12 +2495,12 @@ msgid "Print"
 msgstr "��ӡ"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "��ӡ�ŷ�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:741 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:282 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:17
@@ -2471,20 +2508,20 @@ msgstr "��ӡ�ŷ�"
 msgid "Delete"
 msgstr "ɾ��"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:67
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "�޸Ŀ�Ƭ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:971
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "�ɹ�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "δ֪�Ĵ���"
 
@@ -2493,7 +2530,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:999
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "û��Ȩ��"
 
@@ -2510,9 +2547,10 @@ msgid "Protocol not supported"
 msgstr "��֧�ֵ�Э��"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:40
-#: calendar/gui/calendar-model.c:755 calendar/gui/calendar-model.c:1200
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:607
-#: camel/camel-service.c:643
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "�Ѿ�ȡ��"
 
@@ -2520,31 +2558,36 @@ msgstr "�Ѿ�ȡ��"
 msgid "Other error"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:58
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "��ϣ�������޸���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:58
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "���ӿ�Ƭ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:67
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "�޸��б�����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "ɾ���б�����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
-#: addressbook/gui/widgets/e-addressbook-view.c:1279
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "ɾ����Ƭ����"
 
 #. 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:379
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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 ""
 
@@ -2552,80 +2595,80 @@ msgstr ""
 #. 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:384
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:849
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* ����˴��Ա�������ϵ�� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "��Ҫ�绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "�����绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "����绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "�����绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "��˾�绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "��ͥ�绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "�����ַ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "��ͥ��ַ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "�ֻ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "�����绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "����绰 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "��ͥ�绰 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "�����绰"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "������ַ"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "�Լ����� %d �ſ�Ƭ��"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "�Լ�����һ�ſ�Ƭ��"
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "�����ڵ�ַ����"
 
@@ -2829,40 +2872,49 @@ msgstr "��ӡ��Ƭ"
 msgid "Print envelope"
 msgstr "��ӡ�ŷ�"
 
-#: calendar/cal-util/cal-util.c:424 calendar/cal-util/cal-util.c:446
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "�༭Լ��(_E)"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "��"
 
-#: calendar/cal-util/cal-util.c:426 calendar/cal-util/cal-util.c:448
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "��"
 
-#: calendar/cal-util/cal-util.c:428 calendar/cal-util/cal-util.c:450
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "��"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:922
-#: calendar/conduits/todo/todo-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "��������������ͨѶʱ��������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1051
-#: calendar/conduits/calendar/calendar-conduit.c:1054
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:753
-#: calendar/conduits/todo/todo-conduit.c:756
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2919,11 +2971,25 @@ msgstr "������ʾ����"
 msgid "Factory for the alarm notification service"
 msgstr "������ʾ���񳵼�"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "��ʼʱ��(S)��"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "�Ƿ�����"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "(_w)Evolution ����"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -2982,94 +3048,101 @@ msgstr "�޷����� wombat ������"
 msgid "Could not create the alarm notify service factory"
 msgstr "�޷�����������ʾ���񳵼�"
 
-#: calendar/gui/calendar-commands.c:438
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:441 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
 #: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%Y %b %d %a"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:466
+#: calendar/gui/calendar-commands.c:474
 #: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:676
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "�޷�����������ͼ�� �������� ORBit �� OAF ���á�"
 
-#: calendar/gui/calendar-model.c:416 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:419 calendar/gui/calendar-model.c:999
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:422
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:528
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:528
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:530
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:530
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:595 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "�ż�"
 
-#: calendar/gui/calendar-model.c:597 calendar/gui/e-meeting-time-sel.c:409
-#: shell/evolution-shell-component.c:993
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "��æ"
 
-#: calendar/gui/calendar-model.c:746 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "��δ��ʼ"
 
-#: calendar/gui/calendar-model.c:749 calendar/gui/calendar-model.c:1196
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "���ڽ�����"
 
-#: calendar/gui/calendar-model.c:752 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:315 calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3080,35 +3153,37 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1192 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1452 widgets/misc/e-dateedit.c:1567
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "�����ظ�"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "�ѷ���"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:299
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "��"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2009 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 #, fuzzy
 msgid "Searching"
@@ -3130,24 +3205,24 @@ msgstr "����ͼ"
 msgid "Month View"
 msgstr "����ͼ"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "��Ҫ����"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "��������"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "ע�ͺ���"
 
-#: calendar/gui/cal-search-bar.c:415
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "δƥ��"
 
 #: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "����"
 
@@ -3155,8 +3230,9 @@ msgstr "����"
 msgid "Folder containing appointments and events"
 msgstr "�ļ��к���Լ����¼�"
 
-#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:245
-#: my-evolution/e-summary-tasks.c:261 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "����"
@@ -3186,23 +3262,23 @@ msgstr "������(T)"
 msgid "The URI that the calendar will display"
 msgstr "��������ʾ�� URI"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "��Ƶ����ѡ��"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "��Ϣ����ѡ��"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "�ʼ�����ѡ��"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "���򱨾�ѡ��"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "δ֪����ѡ��"
 
@@ -3230,7 +3306,9 @@ msgstr "�����"
 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 "���ǵ����ʼ���ʾ������ Evolution �в�֧��������ʾ�������޷�Ϊ����ʾ���༭ѡ�"
+msgstr ""
+"���ǵ����ʼ���ʾ������ Evolution �в�֧��������ʾ�������޷�Ϊ����ʾ���༭ѡ"
+"�"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3376,7 +3454,7 @@ msgstr "��ʾ��"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��Ҫ��"
 
@@ -3674,23 +3752,23 @@ msgstr "%s  ���Ѿ��������޸ġ�������Щ�޸IJ����±༭����"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ����û�н����޸ģ����±༭����"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2163
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2167
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2169
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "�����"
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2174
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2176
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr ""
 
@@ -3698,35 +3776,35 @@ msgstr ""
 msgid "Could not update object!"
 msgstr "�޷����¶���"
 
-#: calendar/gui/dialogs/comp-editor.c:671
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "�༭Լ��"
 
-#: calendar/gui/dialogs/comp-editor.c:676
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Լ�� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:679
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "��־��Ŀ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:696
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "û�и�Ҫ"
 
-#: calendar/gui/dialogs/comp-editor.c:1046 mail/mail-callbacks.c:1845
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "�����ļ���"
 
-#: calendar/gui/dialogs/comp-editor.c:1050 mail/mail-callbacks.c:1852
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3735,53 +3813,53 @@ msgstr ""
 "ָ�����Ƶ��ļ��Ѿ����ڡ�\n"
 "��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1094 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "����Ϊ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1249
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "�޷���ȡ��ǰ�汾��"
 
-#: calendar/gui/dialogs/delete-comp.c:97
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "��ȷ����ϣ��ɾ��Լ�� ��%s����"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "��ȷ����ϣ��ɾ�����ޱ���Լ�᣿"
 
-#: calendar/gui/dialogs/delete-comp.c:106
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "��ȷ����ϣ��ɾ������%s����"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "��ȷ����ϣ��ɾ�����ޱ�������"
 
-#: calendar/gui/dialogs/delete-comp.c:115
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "��ȷ����ϣ��ɾ����־��Ŀ��%s����"
 
-#: calendar/gui/dialogs/delete-comp.c:118
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "��ȷ����ϣ��ɾ�����ޱ�����־��Ŀ��"
 
-#: calendar/gui/dialogs/delete-comp.c:133
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "��ȷ����ϣ��ɾ�� %d ��Լ�᣿"
 
-#: calendar/gui/dialogs/delete-comp.c:138
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "��ȷ����ϣ��ɾ�� %d ������"
 
-#: calendar/gui/dialogs/delete-comp.c:143
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "��ȷ����ϣ��ɾ�� %d ����־��Ŀ��"
@@ -3798,7 +3876,7 @@ msgstr "��Ȩ����"
 msgid "Enter Delegate"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Լ��"
 
@@ -3811,12 +3889,12 @@ msgid "Recurrence"
 msgstr "�ٴη���"
 
 #: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:354
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "���ڵ���"
 
 #: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:357
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "���"
 
@@ -3859,7 +3937,7 @@ msgid "Pu_blic"
 msgstr "������(B)"
 
 #: 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 ""
 
@@ -3876,15 +3954,20 @@ msgstr "����ʱ��(E)��"
 msgid "_Start time:"
 msgstr "��ʼʱ��(S)��"
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "��Ҫһ����֯�ߡ�"
 
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "��Ҫ����һ���μ���"
+
 #: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "�Ǹ����Ѿ��μ��˻��飡"
 
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "��Ȩ��(D)..."
 
@@ -3895,49 +3978,56 @@ msgstr "��ϯ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr ""
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* ����˴��Ա�������ϵ�� *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "����...�Ĵ���"
+msgid "Common Name"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "��Ȩ��"
+msgid "Delegated From"
+msgstr "����...�Ĵ���"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "����"
+msgid "Delegated To"
+msgstr "��Ȩ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "��Ա"
+msgid "Language"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "��Ա"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: 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 "��ɫ"
 
-#: 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 "״̬"
 
-#: 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:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "����"
@@ -3952,8 +4042,9 @@ msgid "_Change Organizer"
 msgstr "�ı���֯��(C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "����������(I)"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "����������(I)..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
@@ -4043,10 +4134,6 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:50
-msgid "Do you want to save changes?"
-msgstr "��ϣ�������޸���"
-
 #: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "������Ϣ�Ѿ��ı䡣���͸��°汾��"
@@ -4074,7 +4161,7 @@ msgid "Progress"
 msgstr "����"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL��"
 
@@ -4087,12 +4174,12 @@ msgid "_Status:"
 msgstr "״̬(S)��"
 
 #: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:229
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
@@ -4106,6 +4193,61 @@ msgstr "��ʼ����(R)��"
 msgid "_Due Date:"
 msgstr "Ԥ������(D)��"
 
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
 #: calendar/gui/e-week-view.c:1822
 #, fuzzy
@@ -4113,27 +4255,27 @@ msgid "Deleting selected objects"
 msgstr "ɾ��ѡ�е���ϵ��"
 
 #: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
-#: calendar/gui/e-week-view.c:3363 mail/folder-browser.c:1444
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
 #: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "��(O)"
 
 #: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
-#: calendar/gui/e-week-view.c:3372 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-week-view.c:3404 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:945 calendar/gui/e-day-view.c:3479
-#: calendar/gui/e-week-view.c:3374 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-week-view.c:3406 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:947 calendar/gui/e-day-view.c:3454
-#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3350
-#: calendar/gui/e-week-view.c:3376 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 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"
@@ -4155,28 +4297,29 @@ msgstr "�����������(M)"
 msgid "_Delete Selected Tasks"
 msgstr "ɾ��ѡ��������(D)"
 
-#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:6998
-#: calendar/gui/e-week-view.c:3857
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr "���¶���"
 
 #: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:119 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 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/e-cell-date-edit-text.c:122 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y��%m��%d�� %a %I:%M%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:127
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4191,48 +4334,48 @@ msgstr ""
 msgid "Alarms"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:720
-#: camel/camel-filter-driver.c:836
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Լ������"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "�����"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "���ȼ�"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "��ʼ����"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1460
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "��Ҫ"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4257,84 +4400,386 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3345
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3355
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "ת�Ƶ�����(T)"
 
-#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3357
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "ת�Ƶ�����(G)..."
 
-#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3365
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "ɾ����Լ��(D)"
 
-#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3390
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "ʹ���¼����ƶ�(M)"
 
-#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3392
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "ɾ����ʱ��(O)"
 
-#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3394
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "ɾ�������¼�(A)"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "�������ʱ��(E)��"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��� "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "��Ϣ"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "δ֪�Ĵ���"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "ѡ��һ��"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "ȷ��"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:796
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "���"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "(_p)����æ/����Ϣ"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "û����Ϣ"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "ȡ��"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "��ȡ���µĻ�����Ϣ"
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "��Ϣ"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "���"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "�������ʱ��(E)��"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "��ȡ���µĻ�����Ϣ"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "���"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "ѡ��һ��"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "���ʼ���Ѱ��"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "��ȡ���µ�������Ϣ"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "��Ϣ"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "��ȡ���µ�������Ϣ"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "�ظ�"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "ȡ������"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "������Ϣ"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "(_p)����æ/����Ϣ"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "(_p)����æ/����Ϣ"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "(_r)� URL��"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "(_r)� URL��"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "��һ���ʼ�"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1071
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "�޷����������ļ���\n"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "�������\n"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "��Ϊ�Ƿ�״̬���޷����²�����״̬��\n"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "�޷����²�����״̬��\n"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "���²�����״̬\n"
 
-#: calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "������Ŀ���ٴ��ڶ��޷����²�����״̬"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "���޷������������ļ�ɾ����Ŀ��\n"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "ɾ�����"
 
-#: calendar/gui/e-itip-control.c:1304 calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "��Ŀ�ѷ��ͣ�\n"
 
-#: calendar/gui/e-itip-control.c:1306 calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "�޷�������Ŀ��\n"
 
-#: calendar/gui/e-itip-control.c:1506
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr "�޷��ڲ������б����ҵ������κ����ݣ�\n"
 
@@ -4375,90 +4820,99 @@ msgstr "����-����"
 msgid "date-start"
 msgstr "����-��ʼ"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "����IJ�����"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "��ѡ�IJ�����"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "���μ�"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "��"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "��Դ"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
 #: camel/providers/smtp/camel-smtp-transport.c:222
 #: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "δ֪"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "��ϯ"
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "����IJ�����"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "��ѡ�IJ�����"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "���μ�"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "��Ҫ����"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "���"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:1349 calendar/gui/e-meeting-model.c:1462
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1417
-#: calendar/gui/e-meeting-model.c:1464
-msgid "Required Participants"
-msgstr "����IJ�����"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1466
-msgid "Optional Participants"
-msgstr "��ѡ�IJ�����"
-
-#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1468
-msgid "Non-Participants"
-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
@@ -4470,14 +4924,14 @@ msgstr "%Y��%B��%d�� %A"
 #. 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:2053 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y��%m��%d�� %a"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1576
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%Y��%m��%d��"
 
@@ -4489,10 +4943,6 @@ msgstr "�칫������"
 msgid "No Information"
 msgstr "û����Ϣ"
 
-#: calendar/gui/e-meeting-time-sel.c:427
-msgid "_Invite Others..."
-msgstr "����������(I)..."
-
 #: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "ѡ��(O)"
@@ -4560,21 +5010,21 @@ msgstr "�޷��ӡ�%s����װ������"
 msgid "The method required to load `%s' is not supported"
 msgstr "��֧��װ�롮%s������ķ���"
 
-#: calendar/gui/e-week-view.c:3343 calendar/gui/e-week-view.c:3381
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "��Լ��(A)"
 
-#: calendar/gui/gnome-cal.c:1315
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�޷��򿪡�%s���е��ļ���"
 
-#: calendar/gui/gnome-cal.c:1326
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "��֧�ִ򿪡�%s������ķ���"
 
-#: calendar/gui/gnome-cal.c:1681
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�� %s ������"
@@ -4804,53 +5254,88 @@ msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1830
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "ѡ�е����� (%Y��%b��%d�� %a)"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1853
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%b��%d�� %a"
 
-#: calendar/gui/print.c:1850
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%Y��%d�� %a"
 
-#: calendar/gui/print.c:1854 calendar/gui/print.c:1856
-#: calendar/gui/print.c:1857
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%Y��%b��%d�� %a"
 
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "ѡ�е��� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1869
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "ѡ�е��� (%Y��%b��)"
 
 #. Year
-#: calendar/gui/print.c:1876
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "ѡ�е��� (%Y��)"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "(_t)����"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "״̬(S)��"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "���ȼ�(P)��"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "������ڣ�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL��"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "���"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "(_n)��ϵ�ˣ�"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "��ӡ����"
 
-#: calendar/gui/print.c:2476 calendar/gui/print.c:2568
-#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:614
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "��ӡԤ��"
 
-#: calendar/gui/print.c:2505
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "��ӡ��"
 
-#: calendar/gui/print.c:2586
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "��ӡ����"
 
@@ -4969,8 +5454,8 @@ msgstr "contains? �ĵڶ�������Ӧ�����ַ���"
 
 #: calendar/pcs/query.c:679
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr "contains? �ĵ�һ�����������ǡ����⡱������Ҫ������������֮һ"
 
 #: calendar/pcs/query.c:721
@@ -5039,7 +5524,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -5047,47 +5532,48 @@ msgstr ""
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:661
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:670
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:685
+#: camel/camel-filter-driver.c:686
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:690
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:920
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:926
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -5139,26 +5625,26 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:109
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:122
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:211
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr ""
@@ -5248,63 +5734,63 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5349,12 +5835,12 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5452,7 +5938,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5591,15 +6077,15 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:278
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5607,7 +6093,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5617,7 +6103,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5644,22 +6130,22 @@ msgstr ""
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:251
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:286
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:307
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -5692,40 +6178,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1536
-#: camel/providers/imap/camel-imap-folder.c:1945
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1684
-#: camel/providers/imap/camel-imap-folder.c:1765
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1690
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1982
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -5734,10 +6220,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:242
-#: 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
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -5750,7 +6236,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr ""
 
@@ -5782,28 +6268,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:520
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:530
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:595
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5811,12 +6297,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:894
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1182
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -5856,53 +6342,55 @@ msgstr ""
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:131
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
-#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:177
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:189
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:246
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:288
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:298
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:366
+#: camel/providers/local/camel-local-summary.c:367
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:422
+#: camel/providers/local/camel-local-summary.c:423
 #: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
@@ -5981,7 +6469,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:330
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -6631,7 +7119,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr ""
 
@@ -6861,119 +7349,119 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:847
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:972
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1033
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1488
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2343
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -7036,13 +7524,13 @@ msgstr "�ڱ��Ự�м�ס������"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. 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
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
@@ -7093,30 +7581,30 @@ msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1384 widgets/misc/e-dateedit.c:1611
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:1381 widgets/misc/e-dateedit.c:1608
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr ""
 
@@ -7244,22 +7732,22 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:356
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
 #: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -7274,39 +7762,39 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr ""
 
@@ -7499,7 +7987,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr ""
 
@@ -7531,7 +8019,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr ""
@@ -7544,15 +8032,15 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:160
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:256
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:321
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr ""
 
@@ -7578,20 +8066,20 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:170 importers/netscape-importer.c:707
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
 #: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:376 importers/netscape-importer.c:800
-#: importers/pine-importer.c:505
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:527 importers/netscape-importer.c:973
-#: importers/pine-importer.c:668 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr ""
 
@@ -7605,15 +8093,11 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:229
-msgid "GnomeCard:"
-msgstr ""
-
-#: importers/evolution-gnomecard-importer.c:230 importers/pine-importer.c:673
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:249
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7623,19 +8107,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:903 importers/pine-importer.c:601
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:912
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:978
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:999
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7645,13 +8129,13 @@ msgstr ""
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:694
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:722
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr ""
 
@@ -7687,66 +8171,66 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr ""
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:751
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:958
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1157
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -7759,168 +8243,173 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:292 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:772
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1046
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1434
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1435
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1436
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1626
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "ɾ��"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr ""
@@ -8009,7 +8498,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1629
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8046,27 +8535,27 @@ msgstr ""
 msgid "Mail Settings"
 msgstr ""
 
-#: mail/mail-autofilter.c:69
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:212
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:228
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr ""
 
@@ -8148,53 +8637,53 @@ msgstr ""
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1239
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1241
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1701
+#: mail/mail-callbacks.c:1732
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1726
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1765
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1779
+#: mail/mail-callbacks.c:1810
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1901
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8202,30 +8691,30 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2084
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:2192
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2204
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2267
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2313
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8267,10 +8756,15 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr ""
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�˺���"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8279,6 +8773,14 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "�ռ���"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
@@ -8385,7 +8887,7 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr ""
 
@@ -8393,7 +8895,8 @@ msgstr ""
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr ""
 
@@ -8531,6 +9034,7 @@ msgid "Sending Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr ""
 
@@ -8780,23 +9284,23 @@ msgstr ""
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1615
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "������������"
 
-#: mail/mail-display.c:1617
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "���������"
 
-#: mail/mail-display.c:1620
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "���ӱ���Ϊ (FIXME)"
 
-#: mail/mail-display.c:1623
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "ͼ�񱣴�Ϊ..."
 
@@ -8813,64 +9317,81 @@ msgstr "�޷����� MIME �ʼ�����ʾԴ�ı���"
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "��Ч��ַ"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "����"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "�ظ���"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "ת��"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "ָ�� FTP վ�� (%s)"
 
-#: mail/mail-format.c:2091
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2096
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ָ�򱾵��ļ� (%s)"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ָ��Զ������ (%s)"
 
-#: mail/mail-format.c:2133
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ָ��δ֪���ⲿ���� (��%s������)"
 
-#: mail/mail-format.c:2138
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "�������������ļ���"
 
-#: mail/mail-local.c:701
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8879,27 +9400,27 @@ msgstr ""
 "�޷������ļ���Ԫ��Ϣ�������ܲ���\n"
 "�ܹ��򿪸��ļ��У�%s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�޷����ļ���Ԫ��Ϣ���浽 %s�� %s"
 
-#: mail/mail-local.c:800
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�޷�ɾ���ļ���Ԫ��Ϣ %s�� %s"
 
-#: mail/mail-local.c:1213
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1228
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1250
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8907,144 +9428,145 @@ msgstr ""
 "������޷��򿪸��ʼ��䣬\n"
 "��ô�����ܱ����ֹ��޸�����"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "�����ܸı�Զ���ļ��еĸ�ʽ��"
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "�������� /%s"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:893
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "���ڹ���"
 
-#: mail/mail-ops.c:85
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "���ڹ����ļ���"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "������ȡ�ʼ�"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "���ǣ��ʼ��Ѿ��ɹ����͡�"
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "���ڷ��͡�%s��"
 
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "��ɡ�"
 
-#: mail/mail-ops.c:790
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "���ʼ����浽�ļ�����"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "���ʼ��ƶ��� %s"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "���ʼ����Ƶ� %s"
 
-#: mail/mail-ops.c:892
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "�޷����ļ��С�%s�����Ƶ�������"
-
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "�����ƶ�"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "���ڸ���"
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "���ڡ�%s����ɨ���ļ���"
 
-#: mail/mail-ops.c:1195
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "(_t)����"
+
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "��ת���ʼ�"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "���ڴ��ļ��� %s"
 
-#: mail/mail-ops.c:1310
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "����ɾ���ļ��С�%s��"
 
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1472
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "���ڴ洢�ļ��С�%s��"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "����ˢ���ļ���"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "���ڼ����ʼ� %s"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "���ڼ��� %d ���ʼ�"
 
-#: mail/mail-ops.c:1762
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "���ڱ��� %d ���ʼ�"
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9053,18 +9575,18 @@ msgstr ""
 "�޷���������ļ��� %s\n"
 " %s"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "���ڱ��渽��"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9073,17 +9595,17 @@ msgstr ""
 "�޷���������ļ��� %s��\n"
 " %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�޷�д���ݣ� %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�Ͽ��� %s ������"
 
-#: mail/mail-ops.c:2093
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������ %s ����"
@@ -9189,17 +9711,17 @@ msgstr "��ת���ʼ�"
 msgid "Forwarded Message"
 msgstr "��ת���ʼ�"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���������ļ��У� %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9208,16 +9730,21 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "�ļ���"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "�༭�����ļ���"
 
-#: mail/mail-vfolder.c:799
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "��ͼ�༭�������ڵ������ļ��С�%s����"
 
-#: mail/mail-vfolder.c:853
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "�½������ļ���"
 
@@ -9286,7 +9813,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "���������ʼ��б�"
 
@@ -9322,16 +9849,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "�ļ���"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "û��ѡ��������"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "��ѡ���������"
 
@@ -9399,35 +9926,37 @@ msgstr ""
 msgid "Mail summary"
 msgstr "�ʼ���Ҫ"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:79
-msgid "KBOS:ZSAM:EGAA"
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1488
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr ""
 
@@ -9440,11 +9969,11 @@ msgstr ""
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:246
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:285
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr ""
 
@@ -9460,14 +9989,6 @@ msgstr ""
 msgid "Weather"
 msgstr "����"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS:EGAA:RJTT"
-msgstr ""
-
 #: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "����"
@@ -9488,6 +10009,41 @@ msgstr "��ӡ��Ҫʧ��"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid "F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "����"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "�����ƶ�"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "����"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -10763,6 +11319,19 @@ msgstr "��ʾϸ��"
 msgid "Cancel Operation"
 msgstr "ȡ������"
 
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "�ռ���"
+
+#: shell/e-local-storage.c:175
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "�����ļ���"
+
 #: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "��װ Evolution"
@@ -11055,7 +11624,7 @@ msgstr "���ϰ�����е������ݺ�����"
 msgid "Import a single file"
 msgstr "���뵥���ļ�"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11063,11 +11632,11 @@ msgstr ""
 "��ȴ�...\n"
 "����ɨ����������"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "����ֻ�ܵ�����"
 
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "�� %s��"
@@ -11104,7 +11673,7 @@ msgstr ""
 "(%s:%d)�޷����� Evolution �ʼ����ֽ���\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:744
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11112,6 +11681,23 @@ msgstr ""
 "��ѡ����ϣ��\n"
 "�������Ϣ"
 
+#: shell/e-shell-utils.c:114
+#, fuzzy
+msgid "No folder name specified."
+msgstr "û��ָ���ļ������ơ�"
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-utils.c:127
+msgid "Folder name cannot contain slashes."
+msgstr ""
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "������ $PATH ���Ҳ��� Bug buddy��"
@@ -11163,34 +11749,34 @@ msgstr "(_w)���߹���"
 msgid "Work Offline"
 msgstr "���߹���"
 
-#: shell/e-shell-view.c:213
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(δ��ʾ�ļ���)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1589
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution Ŀǰ���ߡ� ����ð�ť�����߹�����"
 
-#: shell/e-shell-view.c:1643
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �������߹����С�"
 
-#: shell/e-shell-view.c:1649
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution Ŀǰ���ߡ� ����ð�ť�����߹�����"
 
-#: shell/e-shell.c:653
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
@@ -11203,10 +11789,6 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "ȷ��"
-
 #: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "�Ƿ�����"
@@ -11344,10 +11926,6 @@ msgstr "�����ݷ�ʽ����"
 msgid "Shortcuts"
 msgstr "��ݷ�ʽ"
 
-#: shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "�ռ���"
-
 #: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
@@ -11419,68 +11997,69 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ���)"
 
-#: shell/evolution-shell-component.c:973
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA ����"
 
-#: shell/evolution-shell-component.c:975
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "���ж�"
 
-#: shell/evolution-shell-component.c:977
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "�Ƿ�����"
 
-#: shell/evolution-shell-component.c:979
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "�Ѿ�����������"
 
-#: shell/evolution-shell-component.c:981
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "��������"
 
-#: shell/evolution-shell-component.c:983
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "û�ҵ�"
 
-#: shell/evolution-shell-component.c:985
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "��֧�ֵ�����"
 
-#: shell/evolution-shell-component.c:987
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "��֧�ֵķ���"
 
-#: shell/evolution-shell-component.c:989
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "��֧�ֵIJ���"
 
-#: shell/evolution-shell-component.c:991
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "�ڲ�����"
 
-#: shell/evolution-shell-component.c:995
+#: shell/evolution-shell-component.c:1031
 #, fuzzy
 msgid "Exists"
 msgstr "(_x)�˳�"
 
-#: shell/evolution-shell-component.c:997
+#: shell/evolution-shell-component.c:1033
 #, fuzzy
 msgid "Invalid URI"
 msgstr "���� URI"
 
-#: shell/evolution-shell-component.c:1001
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "�������ļ���"
 
-#: shell/evolution-shell-component.c:1003
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "û��ʣ��ռ�"
 
-#: shell/evolution-shell-component.c:1005
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "ԭ����������"
 
@@ -11630,49 +12209,24 @@ msgstr "Evolution ���Դ������ļ��е������ݣ�"
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �����˳� ..."
 
-#: shell/main.c:193
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\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"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-
-#: shell/main.c:214
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"лл\n"
-"Ximian Evolution �Ŷ�\n"
-
-#: shell/main.c:268
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "�޷����� Ximian Evolution shell��"
 
-#: shell/main.c:277
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�޷���ʼ�� Ximian Evolution shell�� %s"
 
-#: shell/main.c:347
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:348
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "�����г�Ա�ĵ���������͵�һ���ļ��С�"
 
-#: shell/main.c:390
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�޷���ʼ�� Bonobo ��Աϵͳ��"
 
@@ -11974,11 +12528,12 @@ msgstr "��ӡ..."
 
 #: 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:236
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "����"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "���沢�ر�"
 
@@ -11994,7 +12549,7 @@ msgstr "�Ѹ���浽����"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "(_f)�ļ�"
@@ -12016,7 +12571,7 @@ msgstr "������ϵ�˲��رնԻ���"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "(_s)����"
 
@@ -12076,10 +12631,6 @@ msgstr "Ϊ������Ȼ���"
 msgid "Customise My Evolution"
 msgstr "�����ҵ� Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "ȡ��"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ȡ����ǰ�ʼ�����"
@@ -12645,7 +13196,7 @@ msgstr "�رոô���"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "(_c)�ر�"
@@ -12676,7 +13227,8 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "������ S/MIME ����֤����ܸ��ʼ�"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "(_o)��ʽ"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -12729,7 +13281,7 @@ msgid "Save in folder..."
 msgstr "���浽�ļ���..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "���浱ǰ�ļ�"
 
@@ -12822,7 +13374,7 @@ msgid "_From Field"
 msgstr "(_f)������"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "(_i)����"
 
@@ -12838,7 +13390,7 @@ msgstr "��_r)�ظ���"
 msgid "_Security"
 msgstr "(_s)��ȫ"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "(_h)����"
 
@@ -13164,15 +13716,15 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:741
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -13258,15 +13810,25 @@ msgstr "�ַ�����"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:149
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "�����༭��"
 
-#: widgets/misc/e-filter-bar.c:165
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "��������"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "��������"
+
+#: widgets/misc/e-filter-bar.h:96
+#, fuzzy
+msgid "Clear"
+msgstr "����"
+
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "ȫ����ʾ"
 
@@ -13309,14 +13871,27 @@ msgstr "���˵�ַ��������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "������������������������"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs()�� �޷���ʼ�� GNOME-VFS"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba()�� �޷���ʼ�� GNOME"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()�� �޷���ʼ�� Bonobo"
+
+#~ msgid "_Invite Others"
+#~ msgstr "����������(I)"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "�޷����ļ��С�%s�����Ƶ�������"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "лл\n"
+#~ "Ximian Evolution �Ŷ�\n"